diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2015-11-02 13:15:20 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2015-11-02 13:15:20 -0500 |
| commit | 06dfd985214afa017a6718b3b3a627bf27e46fa3 (patch) | |
| tree | 877b417164d4fbd1e0be267884c28714ef22c896 /indra/llcorehttp | |
| parent | 20edd5f5f06814f36c56e5fbaa4b4a6cd3fe5a42 (diff) | |
| parent | 848c1909c5879ac2ef2a5d40c756269aa0a40179 (diff) | |
Automated merge with ssh://bitbucket.org/nat_linden/viewer-tools-update
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" ) |