summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorPaul Oppenheim <poppy@lindenlab.com>2009-06-19 23:24:11 +0000
committerPaul Oppenheim <poppy@lindenlab.com>2009-06-19 23:24:11 +0000
commit351ebe9fcb76f3b99c2957004bb8493a904869ee (patch)
tree611a8bc735d719e8ba742c65614dd99634982b9c /indra/llcommon
parentc90c3630ab5c4d002c5c9b0034d19f0d10b1ceff (diff)
result of "svn merge -r123757:124890 svn+ssh://svn.lindenlab.com/svn/linden/branches/improve-unit-testing/iface-04" for QAR-1496
Diffstat (limited to 'indra/llcommon')
-rw-r--r--indra/llcommon/CMakeLists.txt9
1 files changed, 7 insertions, 2 deletions
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index 51bd4354df..beac8df636 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -3,7 +3,6 @@
project(llcommon)
include(00-Common)
-include(LLAddBuildTest)
include(LLCommon)
include_directories(
@@ -202,4 +201,10 @@ target_link_libraries(
${ZLIB_LIBRARIES}
)
-ADD_BUILD_TEST(lllazy llcommon)
+include(LLAddBuildTest)
+SET(llcommon_TEST_SOURCE_FILES
+ # WARNING: Please don't write tests against LLCommon or LLMath until this issue is resolved: https://jira.lindenlab.com/jira/browse/DEV-29456
+ # lllazy.cpp
+ )
+LL_ADD_PROJECT_UNIT_TESTS(llcommon "${llcommon_TEST_SOURCE_FILES}")
+