From c017455439723c16502bd660b83a7a2abcaf297c Mon Sep 17 00:00:00 2001
From: Adam Moss <moss@lindenlab.com>
Date: Thu, 8 Oct 2009 15:45:34 +0000
Subject: [PATCH] DEV-41080 - I found out why llmath can't be unit tested and
fixed it, this checkin is some harmless preparation for that...
---
indra/llcommon/CMakeLists.txt | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index 25ec6c36681..371786c44da 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -235,15 +235,13 @@ target_link_libraries(llcommon
#add unit tests
INCLUDE(LLAddBuildTest)
SET(llcommon_TEST_SOURCE_FILES
+ # unit-testing llcommon is not possible right now as the test-harness *itself* depends upon llcommon, causing a circular dependency. Add your 'unit' tests as integration tests for now.
)
LL_ADD_PROJECT_UNIT_TESTS(llcommon "${llcommon_TEST_SOURCE_FILES}")
#set(TEST_DEBUG on)
set(test_libs llcommon ${LLCOMMON_LIBRARIES} ${WINDOWS_LIBRARIES})
-# Have to treat lllazy test as an integration test until this issue is resolved:
-# https://jira.lindenlab.com/jira/browse/DEV-29456
LL_ADD_INTEGRATION_TEST(lllazy lllazy.cpp "${test_libs}")
-# Also puzzled as to why *CMake* barfs when these are *unit* tests.
LL_ADD_INTEGRATION_TEST(llstring "llstring.cpp" "${test_libs}")
LL_ADD_INTEGRATION_TEST(llrand "llrand.cpp" "${test_libs}")
--
GitLab