12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made unit test names unique between subdirectories and 'tests' directory, removed subdir prefix from compiled executable names. The duplicate filenames confused Eclipse and made things difficult in CMake as well.

release/4.3a0
Richard Roberts 2012-03-15 02:10:37 +00:00
parent 51949ba614
commit b76cf5b07f
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/GtsamTesting.cmake
View File

@ -6,7 +6,7 @@ macro(gtsam_add_tests subdir libs)
file(GLOB tests_srcs "tests/test*.cpp") file(GLOB tests_srcs "tests/test*.cpp")
foreach(test_src ${tests_srcs}) foreach(test_src ${tests_srcs})
get_filename_component(test_base ${test_src} NAME_WE) get_filename_component(test_base ${test_src} NAME_WE)
set( test_bin ${subdir}.${test_base} ) set( test_bin ${test_base} )
message(STATUS "Adding Test ${test_bin}") message(STATUS "Adding Test ${test_bin}")
add_executable(${test_bin} ${test_src}) add_executable(${test_bin} ${test_src})
add_dependencies(check.${subdir} ${test_bin}) add_dependencies(check.${subdir} ${test_bin})
@ -30,7 +30,7 @@ macro(gtsam_add_external_tests subdir libs)
file(GLOB tests_srcs "tests/test*.cpp") file(GLOB tests_srcs "tests/test*.cpp")
foreach(test_src ${tests_srcs}) foreach(test_src ${tests_srcs})
get_filename_component(test_base ${test_src} NAME_WE) get_filename_component(test_base ${test_src} NAME_WE)
set( test_bin ${subdir}.${test_base} ) set( test_bin ${test_base} )
message(STATUS "Adding Test ${test_bin}") message(STATUS "Adding Test ${test_bin}")
add_executable(${test_bin} ${test_src}) add_executable(${test_bin} ${test_src})
add_dependencies(check.${subdir} ${test_bin}) add_dependencies(check.${subdir} ${test_bin})
@ -48,7 +48,7 @@ macro(gtsam_add_timing subdir libs)
file(GLOB base_timing_srcs "tests/time*.cpp") file(GLOB base_timing_srcs "tests/time*.cpp")
foreach(time_src ${base_timing_srcs}) foreach(time_src ${base_timing_srcs})
get_filename_component(time_base ${time_src} NAME_WE) get_filename_component(time_base ${time_src} NAME_WE)
set( time_bin ${subdir}.${time_base} ) set( time_bin ${time_base} )
message(STATUS "Adding Timing Benchmark ${time_bin}") message(STATUS "Adding Timing Benchmark ${time_bin}")
add_executable(${time_bin} ${time_src}) add_executable(${time_bin} ${time_src})
add_dependencies(timing.${subdir} ${time_bin}) add_dependencies(timing.${subdir} ${time_bin})

4
tests/CMakeLists.txt
View File

@ -25,7 +25,7 @@ if (GTSAM_BUILD_TESTS)
list(REMOVE_ITEM tests_srcs ${tests_exclude}) list(REMOVE_ITEM tests_srcs ${tests_exclude})
foreach(test_src ${tests_srcs}) foreach(test_src ${tests_srcs})
get_filename_component(test_base ${test_src} NAME_WE) get_filename_component(test_base ${test_src} NAME_WE)
set( test_bin tests.${test_base} ) set( test_bin ${test_base} )
message(STATUS "Adding Test ${test_bin}") message(STATUS "Adding Test ${test_bin}")
add_executable(${test_bin} ${test_src}) add_executable(${test_bin} ${test_src})
add_dependencies(check.tests ${test_bin}) add_dependencies(check.tests ${test_bin})
@ -43,7 +43,7 @@ if (GTSAM_BUILD_TIMING)
list(REMOVE_ITEM timing_srcs ${tests_exclude}) list(REMOVE_ITEM timing_srcs ${tests_exclude})
foreach(time_src ${timing_srcs}) foreach(time_src ${timing_srcs})
get_filename_component(time_base ${time_src} NAME_WE) get_filename_component(time_base ${time_src} NAME_WE)
set( time_bin tests.${time_base} ) set( time_bin ${time_base} )
message(STATUS "Adding Timing Benchmark ${time_bin}") message(STATUS "Adding Timing Benchmark ${time_bin}")
add_executable(${time_bin} ${time_src}) add_executable(${time_bin} ${time_src})
add_dependencies(timing.tests ${time_bin}) add_dependencies(timing.tests ${time_bin})

2
tests/testGaussianFactorGraph.cpp → tests/testGaussianFactorGraphB.cpp
View File

@ -10,7 +10,7 @@
* -------------------------------------------------------------------------- */ * -------------------------------------------------------------------------- */
/** /**
* @file testGaussianFactorGraph.cpp * @file testGaussianFactorGraphB.cpp
* @brief Unit tests for Linear Factor Graph * @brief Unit tests for Linear Factor Graph
* @author Christian Potthast * @author Christian Potthast
**/ **/

2
tests/testGaussianJunctionTree.cpp → tests/testGaussianJunctionTreeB.cpp
View File

@ -10,7 +10,7 @@
* -------------------------------------------------------------------------- */ * -------------------------------------------------------------------------- */
/** /**
* @file testGaussianJunctionTree.cpp * @file testGaussianJunctionTreeB.cpp
* @date Jul 8, 2010 * @date Jul 8, 2010
* @author nikai * @author nikai
*/ */

2
tests/testInference.cpp → tests/testInferenceB.cpp
View File

@ -10,7 +10,7 @@
* -------------------------------------------------------------------------- */ * -------------------------------------------------------------------------- */
/** /**
* @file testInference.cpp * @file testInferenceB.cpp
* @brief Unit tests for functionality declared in inference.h * @brief Unit tests for functionality declared in inference.h
* @author Frank Dellaert * @author Frank Dellaert
*/ */

2
tests/testSymbolicBayesNet.cpp → tests/testSymbolicBayesNetB.cpp
View File

@ -10,7 +10,7 @@
* -------------------------------------------------------------------------- */ * -------------------------------------------------------------------------- */
/** /**
* @file testSymbolicBayesNet.cpp * @file testSymbolicBayesNetB.cpp
* @brief Unit tests for a symbolic Bayes chain * @brief Unit tests for a symbolic Bayes chain
* @author Frank Dellaert * @author Frank Dellaert
*/ */

2
tests/testSymbolicFactorGraph.cpp → tests/testSymbolicFactorGraphB.cpp
View File

@ -10,7 +10,7 @@
* -------------------------------------------------------------------------- */ * -------------------------------------------------------------------------- */
/** /**
* @file testSymbolicFactorGraph.cpp * @file testSymbolicFactorGraphB.cpp
* @brief Unit tests for a symbolic Factor Graph * @brief Unit tests for a symbolic Factor Graph
* @author Frank Dellaert * @author Frank Dellaert
*/ */