Rename tests and examples to be consistent with the naming rules

xml test results is now generated out of source


git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/add_test_windows@2364 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: ae2dd1592b63f4e7da5e17655761697b6daf7dd0

2 files changed, 11 insertions, 26 deletions

diff --git a/src/Subsampling/example/CMakeLists.txt b/src/Subsampling/example/CMakeLists.txt
index bb043297..71b8d2e8 100644
--- a/src/Subsampling/example/CMakeLists.txt
+++ b/src/Subsampling/example/CMakeLists.txt
@@ -8,10 +8,10 @@ if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1)
   add_executable(Subsampling_example_sparsify_point_set example_sparsify_point_set.cpp)
   target_link_libraries(Subsampling_example_sparsify_point_set ${CGAL_LIBRARY})
 
-  add_test(Subsampling_example_pick_n_random_points
-           ${CMAKE_CURRENT_BINARY_DIR}/Subsampling_example_pick_n_random_points)
-  add_test(Subsampling_example_choose_n_farthest_points
-           ${CMAKE_CURRENT_BINARY_DIR}/Subsampling_example_choose_n_farthest_points)
-  add_test(Subsampling_example_sparsify_point_set
-           ${CMAKE_CURRENT_BINARY_DIR}/Subsampling_example_sparsify_point_set)
+  add_test(NAME Subsampling_example_pick_n_random_points
+      COMMAND $<TARGET_FILE:Subsampling_example_pick_n_random_points>)
+  add_test(NAME Subsampling_example_choose_n_farthest_points
+      COMMAND $<TARGET_FILE:Subsampling_example_choose_n_farthest_points>)
+  add_test(NAME Subsampling_example_sparsify_point_set
+      COMMAND $<TARGET_FILE:Subsampling_example_sparsify_point_set>)
 endif (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1)
diff --git a/src/Subsampling/test/CMakeLists.txt b/src/Subsampling/test/CMakeLists.txt
index 5517fe9d..dbf97db3 100644
--- a/src/Subsampling/test/CMakeLists.txt
+++ b/src/Subsampling/test/CMakeLists.txt
@@ -1,16 +1,9 @@
 cmake_minimum_required(VERSION 2.6)
 project(Subsampling_tests)
 
-if (GCOVR_PATH)
-  # for gcovr to make coverage reports - Corbera Jenkins plugin
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage")
-endif()
-if (GPROF_PATH)
-  # for gprof to make coverage reports - Jenkins
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg")
-endif()
-
 if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1)
+  include(GUDHI_test_coverage)
+
   add_executable( Subsampling_test_pick_n_random_points test_pick_n_random_points.cpp )
   target_link_libraries(Subsampling_test_pick_n_random_points ${CGAL_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 
@@ -20,15 +13,7 @@ if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1)
   add_executable(Subsampling_test_sparsify_point_set test_sparsify_point_set.cpp)
   target_link_libraries(Subsampling_test_sparsify_point_set ${CGAL_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 
-  add_test(Subsampling_test_pick_n_random_points ${CMAKE_CURRENT_BINARY_DIR}/Subsampling_test_pick_n_random_points
-  # XML format for Jenkins xUnit plugin
-  --log_format=XML --log_sink=${CMAKE_SOURCE_DIR}/Subsampling_test_pick_n_random_points_UT.xml --log_level=test_suite --report_level=no)
-
-  add_test(Subsampling_test_choose_n_farthest_points ${CMAKE_CURRENT_BINARY_DIR}/Subsampling_test_choose_n_farthest_points
-  # XML format for Jenkins xUnit plugin
-  --log_format=XML --log_sink=${CMAKE_SOURCE_DIR}/Subsampling_test_choose_n_farthest_points_UT.xml --log_level=test_suite --report_level=no)
-
-  add_test(Subsampling_test_sparsify_point_set ${CMAKE_CURRENT_BINARY_DIR}/Subsampling_test_sparsify_point_set
-  # XML format for Jenkins xUnit plugin
-  --log_format=XML --log_sink=${CMAKE_SOURCE_DIR}/Subsampling_test_sparsify_point_set_UT.xml --log_level=test_suite --report_level=no)
+  gudhi_add_coverage_test(Subsampling_test_pick_n_random_points)
+  gudhi_add_coverage_test(Subsampling_test_choose_n_farthest_points)
+  gudhi_add_coverage_test(Subsampling_test_sparsify_point_set)
 endif (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1)