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/CMakeLists.txt | |
| 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/CMakeLists.txt')
| -rw-r--r-- | indra/llcorehttp/CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llcorehttp/CMakeLists.txt b/indra/llcorehttp/CMakeLists.txt index 3fda524ddf..a0827286e3 100644 --- a/indra/llcorehttp/CMakeLists.txt +++ b/indra/llcorehttp/CMakeLists.txt @@ -125,6 +125,8 @@ if (LL_TESTS) LL_ADD_INTEGRATION_TEST(llcorehttp "${llcorehttp_TEST_SOURCE_FILES}" "${test_libs}" + ${PYTHON_EXECUTABLE} + "${CMAKE_CURRENT_SOURCE_DIR}/tests/test_llcorehttp_peer.py" ) endif (LL_TESTS) |