From 3069355a6f33b7bbcfc8c493910a40e6836249e1 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 1 Sep 2009 14:41:04 +0000
Subject: DEV-34522: [COMMENTS ONLY] clean up comments about (formerly)
disabled tests
---
indra/llcommon/CMakeLists.txt | 4 ++--
indra/llmath/CMakeLists.txt | 3 ++-
indra/llmessage/CMakeLists.txt | 4 ----
indra/newview/CMakeLists.txt | 5 -----
4 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt
index a93623d24e..bc4e44d7e6 100644
--- a/indra/llcommon/CMakeLists.txt
+++ b/indra/llcommon/CMakeLists.txt
@@ -236,13 +236,13 @@ target_link_libraries(
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}")
#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}")
# *TODO - reenable these once tcmalloc libs no longer break the build.
diff --git a/indra/llmath/CMakeLists.txt b/indra/llmath/CMakeLists.txt
index d287a5063a..2bb3800144 100644
--- a/indra/llmath/CMakeLists.txt
+++ b/indra/llmath/CMakeLists.txt
@@ -85,7 +85,8 @@ add_library (llmath ${llmath_SOURCE_FILES})
include(LLAddBuildTest)
SET(llmath_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
+ # nat 2009-08-28: found this commented out and considered implementing it
+ # using LL_ADD_INTEGRATION_TEST, but there's no llvolume_test.cpp source?
# llvolume.cpp
)
LL_ADD_PROJECT_UNIT_TESTS(llmath "${llmath_TEST_SOURCE_FILES}")
diff --git a/indra/llmessage/CMakeLists.txt b/indra/llmessage/CMakeLists.txt
index 536a586b00..1e8b5517e4 100644
--- a/indra/llmessage/CMakeLists.txt
+++ b/indra/llmessage/CMakeLists.txt
@@ -240,8 +240,4 @@ IF (NOT LINUX AND VIEWER)
)
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")
ENDIF (NOT LINUX AND VIEWER)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index a34c9782c0..b95c5d46dd 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1511,11 +1511,6 @@ endif (INSTALL)
include(LLAddBuildTest)
SET(viewer_TEST_SOURCE_FILES
llagentaccess.cpp
- # Not *actually* a unit test, it's an integration test.
- # Because it won't work in the new unit test iface, i've commented out
- # and notified Nat. Delete this when it's replaced!
- # + poppy & brad 2009-06-05
- # llcapabilitylistener.cpp
)
set_source_files_properties(
${viewer_TEST_SOURCE_FILES}
--
cgit v1.2.3