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, 17 insertions, 38 deletions

diff --git a/src/Bitmap_cubical_complex/example/CMakeLists.txt b/src/Bitmap_cubical_complex/example/CMakeLists.txt
index 97a45190..241a11e5 100644
--- a/src/Bitmap_cubical_complex/example/CMakeLists.txt
+++ b/src/Bitmap_cubical_complex/example/CMakeLists.txt
@@ -7,24 +7,19 @@ if (TBB_FOUND)
   target_link_libraries(Bitmap_cubical_complex ${TBB_LIBRARIES})
 endif()
 
-# Do not forget to copy test files in current binary dir
-file(COPY "${CMAKE_SOURCE_DIR}/data/bitmap/CubicalOneSphere.txt" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
-file(COPY "${CMAKE_SOURCE_DIR}/data/bitmap/CubicalTwoSphere.txt" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
+add_test(NAME Bitmap_cubical_complex_example_persistence_one_sphere COMMAND $<TARGET_FILE:Bitmap_cubical_complex>
+    "${CMAKE_SOURCE_DIR}/data/bitmap/CubicalOneSphere.txt")
 
-add_test(Bitmap_cubical_complex_one_sphere
-    ${CMAKE_CURRENT_BINARY_DIR}/Bitmap_cubical_complex
-    ${CMAKE_CURRENT_BINARY_DIR}/CubicalOneSphere.txt)
-
-add_test(Bitmap_cubical_complex_two_sphere
-    ${CMAKE_CURRENT_BINARY_DIR}/Bitmap_cubical_complex
-    ${CMAKE_CURRENT_BINARY_DIR}/CubicalTwoSphere.txt)
+add_test(NAME Bitmap_cubical_complex_example_persistence_two_sphere COMMAND $<TARGET_FILE:Bitmap_cubical_complex>
+    "${CMAKE_SOURCE_DIR}/data/bitmap/CubicalTwoSphere.txt")
 
 add_executable ( Random_bitmap_cubical_complex Random_bitmap_cubical_complex.cpp )
 target_link_libraries(Random_bitmap_cubical_complex ${Boost_SYSTEM_LIBRARY})
 if (TBB_FOUND)
   target_link_libraries(Random_bitmap_cubical_complex ${TBB_LIBRARIES})
 endif()
-add_test(Random_bitmap_cubical_complex ${CMAKE_CURRENT_BINARY_DIR}/Random_bitmap_cubical_complex 2 100 100)
+add_test(NAME Bitmap_cubical_complex_example_random COMMAND $<TARGET_FILE:Random_bitmap_cubical_complex>
+    "2" "100" "100")
 
 add_executable ( Bitmap_cubical_complex_periodic_boundary_conditions Bitmap_cubical_complex_periodic_boundary_conditions.cpp )
 target_link_libraries(Bitmap_cubical_complex_periodic_boundary_conditions ${Boost_SYSTEM_LIBRARY})
@@ -32,14 +27,10 @@ if (TBB_FOUND)
   target_link_libraries(Bitmap_cubical_complex_periodic_boundary_conditions ${TBB_LIBRARIES})
 endif()
 
-# Do not forget to copy test files in current binary dir
-file(COPY "${CMAKE_SOURCE_DIR}/data/bitmap/2d_torus.txt" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
-file(COPY "${CMAKE_SOURCE_DIR}/data/bitmap/3d_torus.txt" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
-
-add_test(Bitmap_cubical_complex_periodic_2d_torus
-    ${CMAKE_CURRENT_BINARY_DIR}/Bitmap_cubical_complex_periodic_boundary_conditions
-    ${CMAKE_CURRENT_BINARY_DIR}/2d_torus.txt)
-add_test(Bitmap_cubical_complex_periodic_3d_torus
-    ${CMAKE_CURRENT_BINARY_DIR}/Bitmap_cubical_complex_periodic_boundary_conditions
-    ${CMAKE_CURRENT_BINARY_DIR}/3d_torus.txt)
+add_test(NAME Bitmap_cubical_complex_example_periodic_boundary_conditions_2d_torus
+    COMMAND $<TARGET_FILE:Bitmap_cubical_complex_periodic_boundary_conditions>
+    "${CMAKE_SOURCE_DIR}/data/bitmap/2d_torus.txt")
 
+add_test(NAME Bitmap_cubical_complex_example_periodic_boundary_conditions_3d_torus
+    COMMAND $<TARGET_FILE:Bitmap_cubical_complex_periodic_boundary_conditions>
+    "${CMAKE_SOURCE_DIR}/data/bitmap/3d_torus.txt")
diff --git a/src/Bitmap_cubical_complex/test/CMakeLists.txt b/src/Bitmap_cubical_complex/test/CMakeLists.txt
index daf0e14f..b2895f85 100644
--- a/src/Bitmap_cubical_complex/test/CMakeLists.txt
+++ b/src/Bitmap_cubical_complex/test/CMakeLists.txt
@@ -1,24 +1,12 @@
 cmake_minimum_required(VERSION 2.6)
 project(Bitmap_cubical_complex_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()
+include(GUDHI_test_coverage)
 
-add_executable ( BitmapCCUT Bitmap_test.cpp )
-target_link_libraries(BitmapCCUT ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
+add_executable ( Bitmap_cubical_complex_test_unit Bitmap_test.cpp )
+target_link_libraries(Bitmap_cubical_complex_test_unit ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
 if (TBB_FOUND)
-  target_link_libraries(BitmapCCUT ${TBB_LIBRARIES})
+  target_link_libraries(Bitmap_cubical_complex_test_unit ${TBB_LIBRARIES})
 endif()
 
-# Unitary tests
-add_test(NAME BitmapCCUT
-  COMMAND ${CMAKE_CURRENT_BINARY_DIR}/BitmapCCUT 
-    # XML format for Jenkins xUnit plugin 
-    --log_format=XML --log_sink=${CMAKE_SOURCE_DIR}/BitmapCCUT.xml --log_level=test_suite --report_level=no)
-
+gudhi_add_coverage_test(Bitmap_cubical_complex_test_unit)