diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2015-07-10 19:37:19 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2015-07-10 19:37:19 -0400 |
| commit | 9bde72f784a4836c3d19ef4dbcd49d4414640d8e (patch) | |
| tree | 7f5baa9b4bc0c6f69454b603d45d8b0518528bed /indra/llcorehttp | |
| parent | 391d9a367b61fe8098ffff0d6a6a54f65f0a3a9e (diff) | |
| parent | 0c915913fd05007bb3fb6cc84be89799b7d85ae5 (diff) | |
Automated merge with file:///Users/nat/linden/maint-4952-v-t-u
Diffstat (limited to 'indra/llcorehttp')
| -rwxr-xr-x | indra/llcorehttp/CMakeLists.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llcorehttp/CMakeLists.txt b/indra/llcorehttp/CMakeLists.txt index a0b1ea13b1..9631e960c5 100755 --- a/indra/llcorehttp/CMakeLists.txt +++ b/indra/llcorehttp/CMakeLists.txt @@ -134,9 +134,13 @@ if (LL_TESTS) ${BOOST_THREAD_LIBRARY} ) + # If http_proxy is in the current environment (e.g. to fetch s3-proxy + # autobuild packages), suppress it for this integration test: it screws up + # the tests. LL_ADD_INTEGRATION_TEST(llcorehttp "${llcorehttp_TEST_SOURCE_FILES}" "${test_libs}" + "-Dhttp_proxy" ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/tests/test_llcorehttp_peer.py" ) |