diff options
| author | Adam Moss <moss@lindenlab.com> | 2009-10-08 15:48:05 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2009-10-08 15:48:05 +0000 |
| commit | ac63aaf7d8545c6701f9aa15bb7482e6c956be84 (patch) | |
| tree | 22c519fbae799c6e86fcc7c103382defd3898071 /indra/llmath | |
| parent | c017455439723c16502bd660b83a7a2abcaf297c (diff) | |
DEV-41080
The unit testing framework itself doesn't (shouldn't) depend upon llmath, so relax that dependancy when we're actually testing llmath itself.
This makes llmath unit-testable.
Subsequently, upgrade some of the llmath Integration tests to something much closer to Unit tests (hooray).
Diffstat (limited to 'indra/llmath')
| -rw-r--r-- | indra/llmath/CMakeLists.txt | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/indra/llmath/CMakeLists.txt b/indra/llmath/CMakeLists.txt index 10b0ef1c86..ea58765b89 100644 --- a/indra/llmath/CMakeLists.txt +++ b/indra/llmath/CMakeLists.txt @@ -85,24 +85,21 @@ add_library (llmath ${llmath_SOURCE_FILES}) # Add tests include(LLAddBuildTest) SET(llmath_TEST_SOURCE_FILES - # 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 + llrect.cpp + v2math.cpp + v3color.cpp + v4coloru.cpp ) LL_ADD_PROJECT_UNIT_TESTS(llmath "${llmath_TEST_SOURCE_FILES}") set(test_libs llmath llcommon ${LLCOMMON_LIBRARIES} ${WINDOWS_LIBRARIES}) -# some of these are probably pretty decent *unit* tests rather than integration tests, but I have to work out a CMake whining puzzle. +# TODO: Some of these need refactoring to be proper Unit tests rather than Integration tests. LL_ADD_INTEGRATION_TEST(llbbox llbbox.cpp "${test_libs}") LL_ADD_INTEGRATION_TEST(llbboxlocal llbboxlocal.cpp "${test_libs}") LL_ADD_INTEGRATION_TEST(mathmisc "" "${test_libs}") -LL_ADD_INTEGRATION_TEST(llrect "llrect.cpp" "${test_libs}") LL_ADD_INTEGRATION_TEST(llquaternion llquaternion.cpp "${test_libs}") -LL_ADD_INTEGRATION_TEST(v2math v2math.cpp "${test_libs}") -LL_ADD_INTEGRATION_TEST(v3color v3color.cpp "${test_libs}") LL_ADD_INTEGRATION_TEST(v3dmath v3dmath.cpp "${test_libs}") LL_ADD_INTEGRATION_TEST(v3math v3math.cpp "${test_libs}") LL_ADD_INTEGRATION_TEST(v4color v4color.cpp "${test_libs}") -LL_ADD_INTEGRATION_TEST(v4coloru v4coloru.cpp "${test_libs}") LL_ADD_INTEGRATION_TEST(v4math v4math.cpp "${test_libs}") LL_ADD_INTEGRATION_TEST(xform xform.cpp "${test_libs}") |