summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAnchor <none@none>2019-05-21 01:28:20 -0700
committerNat Goodspeed <nat@lindenlab.com>2020-03-25 18:40:44 -0400
commit201ff48cb1e548a20af6e52b44494fb49fda4440 (patch)
tree48f5b3ba6392c62ee2e1881143d980ea129a7ca9 /indra
parent244e0dc001eb83a21cda483e0c3b6c40d12b59c0 (diff)
[DRTVWR-476] - temporarily disable llcorehttptest on mac
Diffstat (limited to 'indra')
-rw-r--r--indra/llcorehttp/CMakeLists.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llcorehttp/CMakeLists.txt b/indra/llcorehttp/CMakeLists.txt
index 9e9685f1cb..deb6affdd2 100644
--- a/indra/llcorehttp/CMakeLists.txt
+++ b/indra/llcorehttp/CMakeLists.txt
@@ -142,6 +142,7 @@ 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.
+ if (WINDOWS)
LL_ADD_INTEGRATION_TEST(llcorehttp
"${llcorehttp_TEST_SOURCE_FILES}"
"${test_libs}"
@@ -149,6 +150,7 @@ if (LL_TESTS)
${PYTHON_EXECUTABLE}
"${CMAKE_CURRENT_SOURCE_DIR}/tests/test_llcorehttp_peer.py"
)
+endif (WINDOWS)
if (DARWIN)
# Path inside the app bundle where we'll need to copy libraries