diff options
| author | Paul Oppenheim <poppy@lindenlab.com> | 2009-06-19 23:24:11 +0000 |
|---|---|---|
| committer | Paul Oppenheim <poppy@lindenlab.com> | 2009-06-19 23:24:11 +0000 |
| commit | 351ebe9fcb76f3b99c2957004bb8493a904869ee (patch) | |
| tree | 611a8bc735d719e8ba742c65614dd99634982b9c /indra/llmessage | |
| parent | c90c3630ab5c4d002c5c9b0034d19f0d10b1ceff (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/llmessage')
| -rw-r--r-- | indra/llmessage/CMakeLists.txt | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/indra/llmessage/CMakeLists.txt b/indra/llmessage/CMakeLists.txt index c0f7a4d335..88f83ba78e 100644 --- a/indra/llmessage/CMakeLists.txt +++ b/indra/llmessage/CMakeLists.txt @@ -217,9 +217,14 @@ IF (NOT LINUX AND VIEWER) # When building the viewer the tests links against the shared objects. # These can not be found when we try to run the tests, so we had to disable them, for the viewer build. # TODO: Can someone with viewer knowledge figure out how to make these find the correct so. - #ADD_BUILD_TEST(llhttpclientadapter llmessage) - ADD_BUILD_TEST(lltrustedmessageservice llmessage) - ADD_BUILD_TEST(lltemplatemessagedispatcher llmessage) + SET(llmessage_TEST_SOURCE_FILES + # llhttpclientadapter.cpp + lltrustedmessageservice.cpp + lltemplatemessagedispatcher.cpp + ) + LL_ADD_PROJECT_UNIT_TESTS(llmessage "${llmessage_TEST_SOURCE_FILES}") + + # Commented out - see rationale at bottom of newview's build file + poppy 2009-06-05 # Don't make llmessage depend on llsdmessage_test because ADD_COMM_BUILD_TEST depends on llmessage! - ADD_COMM_BUILD_TEST(llsdmessage "" "${CMAKE_CURRENT_SOURCE_DIR}/tests/test_llsdmessage_peer.py") + # ADD_COMM_BUILD_TEST(llsdmessage "" "${CMAKE_CURRENT_SOURCE_DIR}/tests/test_llsdmessage_peer.py") ENDIF (NOT LINUX AND VIEWER) |