summaryrefslogtreecommitdiff
path: root/indra/llcorehttp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2016-12-06 13:07:48 -0500
committerOz Linden <oz@lindenlab.com>2016-12-06 13:07:48 -0500
commit26e1f59dcb06750e20701761b09a0926ca7f471f (patch)
tree78d1d2d48b186220442bde505f4b139a898f67ac /indra/llcorehttp
parentc21571474c0022f83a4efc28d59e97fc020fd0e7 (diff)
parentf43768414daedd89f922e0d7e9e96f639ceb9bfa (diff)
pull in hack to comment out llcorehttp_test
Diffstat (limited to 'indra/llcorehttp')
-rw-r--r--indra/llcorehttp/CMakeLists.txt14
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/llcorehttp/CMakeLists.txt b/indra/llcorehttp/CMakeLists.txt
index 0bb0348d26..2919e8b6e2 100644
--- a/indra/llcorehttp/CMakeLists.txt
+++ b/indra/llcorehttp/CMakeLists.txt
@@ -136,13 +136,13 @@ if (LL_TESTS)
# 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"
- )
+ #LL_ADD_INTEGRATION_TEST(llcorehttp
+ # "${llcorehttp_TEST_SOURCE_FILES}"
+ # "${test_libs}"
+ # "-Dhttp_proxy"
+ # ${PYTHON_EXECUTABLE}
+ # "${CMAKE_CURRENT_SOURCE_DIR}/tests/test_llcorehttp_peer.py"
+ # )
if (DARWIN)
# Path inside the app bundle where we'll need to copy libraries