From 7db4992f34c67b5585a3250b21efbd27393d38d7 Mon Sep 17 00:00:00 2001 From: Adam Moss Date: Thu, 8 Oct 2009 11:47:27 +0000 Subject: DEV-41081 turn llstring_tut into a real llcommon unit (well, integration :() test. --- indra/llcommon/CMakeLists.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'indra/llcommon/CMakeLists.txt') diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt index bc4e44d7e6..ad1eb1b310 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(Boost) @@ -224,8 +223,7 @@ set_source_files_properties(${llcommon_HEADER_FILES} list(APPEND llcommon_SOURCE_FILES ${llcommon_HEADER_FILES}) add_library (llcommon ${llcommon_SOURCE_FILES}) -target_link_libraries( - llcommon +target_link_libraries(llcommon ${APRUTIL_LIBRARIES} ${APR_LIBRARIES} ${EXPAT_LIBRARIES} @@ -234,7 +232,8 @@ target_link_libraries( ${BOOST_REGEX_LIBRARY} ) -include(LLAddBuildTest) +#add unit tests +INCLUDE(LLAddBuildTest) SET(llcommon_TEST_SOURCE_FILES ) LL_ADD_PROJECT_UNIT_TESTS(llcommon "${llcommon_TEST_SOURCE_FILES}") @@ -244,6 +243,8 @@ 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 this is a *unit* test. +LL_ADD_INTEGRATION_TEST(llstring llstring.cpp "${test_libs}") # *TODO - reenable these once tcmalloc libs no longer break the build. #ADD_BUILD_TEST(llallocator llcommon) -- cgit v1.2.3 From 1ee157028845048d931c0c7fdd1bcac53bda324e Mon Sep 17 00:00:00 2001 From: Adam Moss Date: Thu, 8 Oct 2009 13:52:53 +0000 Subject: DEV-41090 convert legacy llrand tut test into a llcommon integration test. --- indra/llcommon/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'indra/llcommon/CMakeLists.txt') diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt index ad1eb1b310..25ec6c3668 100644 --- a/indra/llcommon/CMakeLists.txt +++ b/indra/llcommon/CMakeLists.txt @@ -243,8 +243,9 @@ 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 this is a *unit* test. -LL_ADD_INTEGRATION_TEST(llstring llstring.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}") # *TODO - reenable these once tcmalloc libs no longer break the build. #ADD_BUILD_TEST(llallocator llcommon) -- cgit v1.2.3 From c017455439723c16502bd660b83a7a2abcaf297c Mon Sep 17 00:00:00 2001 From: Adam Moss Date: Thu, 8 Oct 2009 15:45:34 +0000 Subject: 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(-) (limited to 'indra/llcommon/CMakeLists.txt') diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt index 25ec6c3668..371786c44d 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}") -- cgit v1.2.3 From b73e71ebdf4366b11d3fd43ac80e2a3dc7f30cb2 Mon Sep 17 00:00:00 2001 From: Adam Moss Date: Mon, 12 Oct 2009 14:13:57 +0000 Subject: DEV-41174 more automated testing love * turn llnamevalue_tut into a llmessage unit test * turn llsdserialize_tut into a llcommon integration test * re-enable the (quite slow) llsdserialize test on win32 now that it doesn't have to run on every recompile * re-enable all llmessage unit tests on linux viewer builds --- indra/llcommon/CMakeLists.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'indra/llcommon/CMakeLists.txt') diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt index 371786c44d..0861783df1 100644 --- a/indra/llcommon/CMakeLists.txt +++ b/indra/llcommon/CMakeLists.txt @@ -241,9 +241,10 @@ LL_ADD_PROJECT_UNIT_TESTS(llcommon "${llcommon_TEST_SOURCE_FILES}") #set(TEST_DEBUG on) set(test_libs llcommon ${LLCOMMON_LIBRARIES} ${WINDOWS_LIBRARIES}) -LL_ADD_INTEGRATION_TEST(lllazy lllazy.cpp "${test_libs}") -LL_ADD_INTEGRATION_TEST(llstring "llstring.cpp" "${test_libs}") +LL_ADD_INTEGRATION_TEST(lllazy "lllazy.cpp" "${test_libs}") LL_ADD_INTEGRATION_TEST(llrand "llrand.cpp" "${test_libs}") +LL_ADD_INTEGRATION_TEST(llsdserialize "llsdserialize.cpp" "${test_libs}") +LL_ADD_INTEGRATION_TEST(llstring "llstring.cpp" "${test_libs}") # *TODO - reenable these once tcmalloc libs no longer break the build. #ADD_BUILD_TEST(llallocator llcommon) -- cgit v1.2.3 From c3c03419fec9147c3be3518d46078279155d8f44 Mon Sep 17 00:00:00 2001 From: Adam Moss Date: Mon, 12 Oct 2009 14:20:51 +0000 Subject: DEV-41175 convert legacy common.cpp tut test into llcommon integration test. --- indra/llcommon/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/llcommon/CMakeLists.txt') diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt index 0861783df1..8e562ad5e0 100644 --- a/indra/llcommon/CMakeLists.txt +++ b/indra/llcommon/CMakeLists.txt @@ -241,6 +241,7 @@ LL_ADD_PROJECT_UNIT_TESTS(llcommon "${llcommon_TEST_SOURCE_FILES}") #set(TEST_DEBUG on) set(test_libs llcommon ${LLCOMMON_LIBRARIES} ${WINDOWS_LIBRARIES}) +LL_ADD_INTEGRATION_TEST(commonmisc "" "${test_libs}") LL_ADD_INTEGRATION_TEST(lllazy "lllazy.cpp" "${test_libs}") LL_ADD_INTEGRATION_TEST(llrand "llrand.cpp" "${test_libs}") LL_ADD_INTEGRATION_TEST(llsdserialize "llsdserialize.cpp" "${test_libs}") -- cgit v1.2.3 From 2a99e18ea152ef8843a12d7056436ee01dff5964 Mon Sep 17 00:00:00 2001 From: Adam Moss Date: Mon, 12 Oct 2009 14:56:03 +0000 Subject: DEV-41178 convert lldate legacy monolithic tut test into a llcommon integration test. --- indra/llcommon/CMakeLists.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'indra/llcommon/CMakeLists.txt') diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt index 8e562ad5e0..48e053b8ee 100644 --- a/indra/llcommon/CMakeLists.txt +++ b/indra/llcommon/CMakeLists.txt @@ -242,10 +242,11 @@ LL_ADD_PROJECT_UNIT_TESTS(llcommon "${llcommon_TEST_SOURCE_FILES}") #set(TEST_DEBUG on) set(test_libs llcommon ${LLCOMMON_LIBRARIES} ${WINDOWS_LIBRARIES}) LL_ADD_INTEGRATION_TEST(commonmisc "" "${test_libs}") -LL_ADD_INTEGRATION_TEST(lllazy "lllazy.cpp" "${test_libs}") -LL_ADD_INTEGRATION_TEST(llrand "llrand.cpp" "${test_libs}") -LL_ADD_INTEGRATION_TEST(llsdserialize "llsdserialize.cpp" "${test_libs}") -LL_ADD_INTEGRATION_TEST(llstring "llstring.cpp" "${test_libs}") +LL_ADD_INTEGRATION_TEST(lldate "" "${test_libs}") +LL_ADD_INTEGRATION_TEST(lllazy "" "${test_libs}") +LL_ADD_INTEGRATION_TEST(llrand "" "${test_libs}") +LL_ADD_INTEGRATION_TEST(llsdserialize "" "${test_libs}") +LL_ADD_INTEGRATION_TEST(llstring "" "${test_libs}") # *TODO - reenable these once tcmalloc libs no longer break the build. #ADD_BUILD_TEST(llallocator llcommon) -- cgit v1.2.3 From 423f5b0078d813a14759f9671c11aedadc3a2d78 Mon Sep 17 00:00:00 2001 From: Adam Moss Date: Thu, 15 Oct 2009 16:32:56 +0000 Subject: DEV-41341 tut lltiming test -> llframetimer integration test --- indra/llcommon/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/llcommon/CMakeLists.txt') diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt index 48e053b8ee..10c145e17b 100644 --- a/indra/llcommon/CMakeLists.txt +++ b/indra/llcommon/CMakeLists.txt @@ -247,8 +247,10 @@ LL_ADD_INTEGRATION_TEST(lllazy "" "${test_libs}") LL_ADD_INTEGRATION_TEST(llrand "" "${test_libs}") LL_ADD_INTEGRATION_TEST(llsdserialize "" "${test_libs}") LL_ADD_INTEGRATION_TEST(llstring "" "${test_libs}") +LL_ADD_INTEGRATION_TEST(llframetimer "" "${test_libs}") # *TODO - reenable these once tcmalloc libs no longer break the build. #ADD_BUILD_TEST(llallocator llcommon) #ADD_BUILD_TEST(llallocator_heap_profile llcommon) #ADD_BUILD_TEST(llmemtype llcommon) + -- cgit v1.2.3 From c7df37b5312d60ef5b8b6d41b6c14065cffdb976 Mon Sep 17 00:00:00 2001 From: Adam Moss Date: Thu, 15 Oct 2009 16:49:08 +0000 Subject: DEV-41344 convert monolithic tut lltreeiterators test to a llcommon integration test. --- indra/llcommon/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'indra/llcommon/CMakeLists.txt') diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt index 10c145e17b..c8e030623b 100644 --- a/indra/llcommon/CMakeLists.txt +++ b/indra/llcommon/CMakeLists.txt @@ -243,11 +243,12 @@ LL_ADD_PROJECT_UNIT_TESTS(llcommon "${llcommon_TEST_SOURCE_FILES}") set(test_libs llcommon ${LLCOMMON_LIBRARIES} ${WINDOWS_LIBRARIES}) LL_ADD_INTEGRATION_TEST(commonmisc "" "${test_libs}") LL_ADD_INTEGRATION_TEST(lldate "" "${test_libs}") +LL_ADD_INTEGRATION_TEST(llframetimer "" "${test_libs}") LL_ADD_INTEGRATION_TEST(lllazy "" "${test_libs}") LL_ADD_INTEGRATION_TEST(llrand "" "${test_libs}") LL_ADD_INTEGRATION_TEST(llsdserialize "" "${test_libs}") LL_ADD_INTEGRATION_TEST(llstring "" "${test_libs}") -LL_ADD_INTEGRATION_TEST(llframetimer "" "${test_libs}") +LL_ADD_INTEGRATION_TEST(lltreeiterators "" "${test_libs}") # *TODO - reenable these once tcmalloc libs no longer break the build. #ADD_BUILD_TEST(llallocator llcommon) -- cgit v1.2.3 From 986bf99839a79f13a4b16218c221cb123d4bfc15 Mon Sep 17 00:00:00 2001 From: Adam Moss Date: Thu, 15 Oct 2009 18:05:15 +0000 Subject: DEV-41352 convert lluri tut test to a llcommon integration test --- indra/llcommon/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/llcommon/CMakeLists.txt') diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt index c8e030623b..85447ddd64 100644 --- a/indra/llcommon/CMakeLists.txt +++ b/indra/llcommon/CMakeLists.txt @@ -249,6 +249,7 @@ LL_ADD_INTEGRATION_TEST(llrand "" "${test_libs}") LL_ADD_INTEGRATION_TEST(llsdserialize "" "${test_libs}") LL_ADD_INTEGRATION_TEST(llstring "" "${test_libs}") LL_ADD_INTEGRATION_TEST(lltreeiterators "" "${test_libs}") +LL_ADD_INTEGRATION_TEST(lluri "" "${test_libs}") # *TODO - reenable these once tcmalloc libs no longer break the build. #ADD_BUILD_TEST(llallocator llcommon) -- cgit v1.2.3 From db6dff1d1f1a3ba178cd24095a2bc0c56b63f0a9 Mon Sep 17 00:00:00 2001 From: Adam Moss Date: Thu, 15 Oct 2009 18:10:46 +0000 Subject: DEV-41354 convert llerror tut test into a llcommon integration test --- indra/llcommon/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/llcommon/CMakeLists.txt') diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt index 85447ddd64..414aaea08b 100644 --- a/indra/llcommon/CMakeLists.txt +++ b/indra/llcommon/CMakeLists.txt @@ -243,6 +243,7 @@ LL_ADD_PROJECT_UNIT_TESTS(llcommon "${llcommon_TEST_SOURCE_FILES}") set(test_libs llcommon ${LLCOMMON_LIBRARIES} ${WINDOWS_LIBRARIES}) LL_ADD_INTEGRATION_TEST(commonmisc "" "${test_libs}") LL_ADD_INTEGRATION_TEST(lldate "" "${test_libs}") +LL_ADD_INTEGRATION_TEST(llerror "" "${test_libs}") LL_ADD_INTEGRATION_TEST(llframetimer "" "${test_libs}") LL_ADD_INTEGRATION_TEST(lllazy "" "${test_libs}") LL_ADD_INTEGRATION_TEST(llrand "" "${test_libs}") -- cgit v1.2.3 From 35c0d21c1ec4628462ec766e39f1d5b77df54d17 Mon Sep 17 00:00:00 2001 From: Adam Moss Date: Thu, 15 Oct 2009 18:44:59 +0000 Subject: DEV-41366 convert monolithic llbase64 test into a llcommon integration test. --- indra/llcommon/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/llcommon/CMakeLists.txt') diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt index 414aaea08b..cc55742df6 100644 --- a/indra/llcommon/CMakeLists.txt +++ b/indra/llcommon/CMakeLists.txt @@ -242,6 +242,7 @@ LL_ADD_PROJECT_UNIT_TESTS(llcommon "${llcommon_TEST_SOURCE_FILES}") #set(TEST_DEBUG on) set(test_libs llcommon ${LLCOMMON_LIBRARIES} ${WINDOWS_LIBRARIES}) LL_ADD_INTEGRATION_TEST(commonmisc "" "${test_libs}") +LL_ADD_INTEGRATION_TEST(llbase64 "" "${test_libs}") LL_ADD_INTEGRATION_TEST(lldate "" "${test_libs}") LL_ADD_INTEGRATION_TEST(llerror "" "${test_libs}") LL_ADD_INTEGRATION_TEST(llframetimer "" "${test_libs}") -- cgit v1.2.3 From 9672abecd4b2bbcb9a6b6d0f30b0df97da079f22 Mon Sep 17 00:00:00 2001 From: Adam Moss Date: Thu, 15 Oct 2009 18:51:23 +0000 Subject: DEV-41367 resurrect dead bitpack test, convert it to a llcommon integration test. --- indra/llcommon/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/llcommon/CMakeLists.txt') diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt index cc55742df6..d635fad832 100644 --- a/indra/llcommon/CMakeLists.txt +++ b/indra/llcommon/CMakeLists.txt @@ -242,6 +242,7 @@ LL_ADD_PROJECT_UNIT_TESTS(llcommon "${llcommon_TEST_SOURCE_FILES}") #set(TEST_DEBUG on) set(test_libs llcommon ${LLCOMMON_LIBRARIES} ${WINDOWS_LIBRARIES}) LL_ADD_INTEGRATION_TEST(commonmisc "" "${test_libs}") +LL_ADD_INTEGRATION_TEST(bitpack "" "${test_libs}") LL_ADD_INTEGRATION_TEST(llbase64 "" "${test_libs}") LL_ADD_INTEGRATION_TEST(lldate "" "${test_libs}") LL_ADD_INTEGRATION_TEST(llerror "" "${test_libs}") -- cgit v1.2.3