diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2012-06-11 19:06:52 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2012-06-11 19:06:52 -0400 |
| commit | 75242eab8f8a892c792681fca080d86cfbb3e061 (patch) | |
| tree | 9703c6539ecb58b657b6b2d11bedf35eb8573ce6 /indra/llcorehttp/tests/llcorehttp_test.h | |
| parent | 267ab5b417eaef64a170d69ad83334df9d566ed9 (diff) | |
Bring in the testrunner/http server scaffold for better integration testing.
This brings in a copy of llmessage's llsdmessage testing server. We run
a mocked HTTP service to handle requests and the integration tests run
against it by picking up the LL_TEST_PORT environment variable when running.
Add some checks and output to produce useful info when run in the wrong
environment and when bad status is received. Later will add a dead port
as well so we can test that rather than use 'localhost:2'.
Diffstat (limited to 'indra/llcorehttp/tests/llcorehttp_test.h')
| -rw-r--r-- | indra/llcorehttp/tests/llcorehttp_test.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llcorehttp/tests/llcorehttp_test.h b/indra/llcorehttp/tests/llcorehttp_test.h index 1550881a00..a9567435ce 100644 --- a/indra/llcorehttp/tests/llcorehttp_test.h +++ b/indra/llcorehttp/tests/llcorehttp_test.h @@ -32,6 +32,9 @@ #include <curl/curl.h> #include <openssl/crypto.h> +#include <string> + +#include "httprequest.h" // Initialization and cleanup for libcurl. Mainly provides // a mutex callback for SSL and a thread ID hash for libcurl. @@ -40,6 +43,8 @@ // operations. extern void init_curl(); extern void term_curl(); +extern std::string get_base_url(); +extern void stop_thread(LLCore::HttpRequest * req); class ScopedCurlInit { |