summaryrefslogtreecommitdiff
path: root/indra/llcorehttp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2016-12-07 22:49:59 -0500
committerNat Goodspeed <nat@lindenlab.com>2016-12-07 22:49:59 -0500
commit938b803d894cb4be0af2f4068ab98fd6f4cad08f (patch)
treed0e01991224e65aa4bae8759d9bbe6b0aaf403eb /indra/llcorehttp
parent0a9794398c3b156adcc42d0c86925b37a8fc7b35 (diff)
Backed out changeset fbcb5f5fb015: restore llcorehttp tests.
Diffstat (limited to 'indra/llcorehttp')
-rw-r--r--indra/llcorehttp/CMakeLists.txt10
1 files changed, 3 insertions, 7 deletions
diff --git a/indra/llcorehttp/CMakeLists.txt b/indra/llcorehttp/CMakeLists.txt
index 767136f9a1..0bb0348d26 100644
--- a/indra/llcorehttp/CMakeLists.txt
+++ b/indra/llcorehttp/CMakeLists.txt
@@ -96,12 +96,7 @@ target_link_libraries(
)
# tests
-##==========================================================================
-## DANGER WILL ROBINSON! WARNING!
-## Leaving these tests commented out is extremely hazardous, since llcorehttp
-## is so central to viewer processing.
-##==========================================================================
-if (0) ## LL_TESTS)
+if (LL_TESTS)
SET(llcorehttp_TEST_SOURCE_FILES
tests/test_allocator.cpp
)
@@ -226,4 +221,5 @@ endif (DARWIN)
target_link_libraries(http_texture_load ${example_libs})
-endif ()
+endif (LL_TESTS)
+