summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnchor <none@none>2019-05-21 02:09:50 -0700
committerNat Goodspeed <nat@lindenlab.com>2020-03-25 18:40:44 -0400
commitca66cea70def0e8257c58c7676b0675d37b764f4 (patch)
tree0476879d0828996e0b5efdbf8b5d0ea41d348f58
parentcc230eef30821aabfd99b6a62b9500c25523464b (diff)
[DRTVWR-476] - revert
-rw-r--r--indra/llcorehttp/CMakeLists.txt10
1 files changed, 1 insertions, 9 deletions
diff --git a/indra/llcorehttp/CMakeLists.txt b/indra/llcorehttp/CMakeLists.txt
index 9fd08b5fe8..7b6b2224ef 100644
--- a/indra/llcorehttp/CMakeLists.txt
+++ b/indra/llcorehttp/CMakeLists.txt
@@ -142,7 +142,6 @@ 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}"
@@ -150,14 +149,7 @@ if (LL_TESTS)
${PYTHON_EXECUTABLE}
"${CMAKE_CURRENT_SOURCE_DIR}/tests/test_llcorehttp_peer.py"
)
- endif (WINDOWS)
- if (DARWIN)
- LL_ADD_INTEGRATION_TEST(llcorehttp
- "${llcorehttp_TEST_SOURCE_FILES}"
- "${test_libs}"
- )
-
- endif (DARWIN)
+
if (DARWIN)
# Path inside the app bundle where we'll need to copy libraries
set(LL_TEST_DESTINATION_DIR