Rename CMake tests

Add specific GUDHI test coverage function 
Rename cmake/modules/GUDHI_*.txt


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

Former-commit-id: 071b1eda7d11b1781a9601a013b88a0b2a9b7bf7

2 files changed, 21 insertions, 26 deletions

diff --git a/src/Alpha_complex/example/CMakeLists.txt b/src/Alpha_complex/example/CMakeLists.txt
index b9bcdb55..ab09fe91 100644
--- a/src/Alpha_complex/example/CMakeLists.txt
+++ b/src/Alpha_complex/example/CMakeLists.txt
@@ -4,26 +4,30 @@ project(Alpha_complex_examples)
 # need CGAL 4.7
 # cmake -DCGAL_DIR=~/workspace/CGAL-4.7 ..
 if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.7.0)
-  add_executable ( alphapoints Alpha_complex_from_points.cpp )
-  target_link_libraries(alphapoints  ${Boost_SYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY} ${CGAL_LIBRARY})
-  add_executable ( alphaoffreader Alpha_complex_from_off.cpp )
-  target_link_libraries(alphaoffreader  ${Boost_SYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY} ${CGAL_LIBRARY})
+  add_executable ( Alpha_complex_example_from_points Alpha_complex_from_points.cpp )
+  target_link_libraries(Alpha_complex_example_from_points  ${Boost_SYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY} ${CGAL_LIBRARY})
+  add_executable ( Alpha_complex_example_from_off Alpha_complex_from_off.cpp )
+  target_link_libraries(Alpha_complex_example_from_off  ${Boost_SYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY} ${CGAL_LIBRARY})
   if (TBB_FOUND)
-    target_link_libraries(alphapoints ${TBB_LIBRARIES})
-    target_link_libraries(alphaoffreader ${TBB_LIBRARIES})
+    target_link_libraries(Alpha_complex_example_from_points ${TBB_LIBRARIES})
+    target_link_libraries(Alpha_complex_example_from_off ${TBB_LIBRARIES})
   endif()
 
-  add_test(alphapoints ${CMAKE_CURRENT_BINARY_DIR}/alphapoints)
+  add_test(NAME Alpha_complex_example_from_points COMMAND $<TARGET_FILE:Alpha_complex_example_from_points>)
+
   # Do not forget to copy test files in current binary dir
-  file(COPY "${CMAKE_SOURCE_DIR}/data/points/alphacomplexdoc.off" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
-  add_test(alphaoffreader_doc_60 ${CMAKE_CURRENT_BINARY_DIR}/alphaoffreader alphacomplexdoc.off 60.0 ${CMAKE_CURRENT_BINARY_DIR}/alphaoffreader_result_60.txt)
-  add_test(alphaoffreader_doc_32 ${CMAKE_CURRENT_BINARY_DIR}/alphaoffreader alphacomplexdoc.off 32.0 ${CMAKE_CURRENT_BINARY_DIR}/alphaoffreader_result_32.txt)
+  add_test(NAME Alpha_complex_example_from_off_60 COMMAND $<TARGET_FILE:Alpha_complex_example_from_off>
+      "${CMAKE_SOURCE_DIR}/data/points/alphacomplexdoc.off" "60.0" "${CMAKE_CURRENT_BINARY_DIR}/alphaoffreader_result_60.txt")
+  add_test(NAME Alpha_complex_example_from_off_32 COMMAND $<TARGET_FILE:Alpha_complex_example_from_off>
+      "${CMAKE_SOURCE_DIR}/data/points/alphacomplexdoc.off" "32.0" "${CMAKE_CURRENT_BINARY_DIR}/alphaoffreader_result_32.txt")
   if (DIFF_PATH)
     # Do not forget to copy test results files in current binary dir
     file(COPY "alphaoffreader_for_doc_32.txt" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
     file(COPY "alphaoffreader_for_doc_60.txt" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
 
-    add_test(alphaoffreader_doc_60_diff_files ${DIFF_PATH} ${CMAKE_CURRENT_BINARY_DIR}/alphaoffreader_result_60.txt ${CMAKE_CURRENT_BINARY_DIR}/alphaoffreader_for_doc_60.txt)
-    add_test(alphaoffreader_doc_32_diff_files ${DIFF_PATH} ${CMAKE_CURRENT_BINARY_DIR}/alphaoffreader_result_32.txt ${CMAKE_CURRENT_BINARY_DIR}/alphaoffreader_for_doc_32.txt)
+    add_test(Alpha_complex_example_from_off_60_diff_files ${DIFF_PATH}
+        ${CMAKE_CURRENT_BINARY_DIR}/alphaoffreader_result_60.txt ${CMAKE_CURRENT_BINARY_DIR}/alphaoffreader_for_doc_60.txt)
+    add_test(Alpha_complex_example_from_off_32_diff_files ${DIFF_PATH}
+        ${CMAKE_CURRENT_BINARY_DIR}/alphaoffreader_result_32.txt ${CMAKE_CURRENT_BINARY_DIR}/alphaoffreader_for_doc_32.txt)
   endif()
 endif(NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.7.0)
diff --git a/src/Alpha_complex/test/CMakeLists.txt b/src/Alpha_complex/test/CMakeLists.txt
index 32091196..59f86c5b 100644
--- a/src/Alpha_complex/test/CMakeLists.txt
+++ b/src/Alpha_complex/test/CMakeLists.txt
@@ -1,28 +1,19 @@
 cmake_minimum_required(VERSION 2.6)
 project(Alpha_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)
 
 if (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.7.0)
-  add_executable ( AlphaComplexUT Alpha_complex_unit_test.cpp )
-  target_link_libraries(AlphaComplexUT  ${Boost_SYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY} ${CGAL_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
+  add_executable ( Alpha_complex_unit_test Alpha_complex_unit_test.cpp )
+  target_link_libraries(Alpha_complex_unit_test  ${Boost_SYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY} ${CGAL_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
   if (TBB_FOUND)
-    target_link_libraries(AlphaComplexUT ${TBB_LIBRARIES})
+    target_link_libraries(Alpha_complex_unit_test ${TBB_LIBRARIES})
   endif()
 
   # Do not forget to copy test files in current binary dir
   file(COPY "${CMAKE_SOURCE_DIR}/data/points/alphacomplexdoc.off" DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/)
 
-  add_test(AlphaComplexUT ${CMAKE_CURRENT_BINARY_DIR}/AlphaComplexUT
-  # XML format for Jenkins xUnit plugin
-  --log_format=XML --log_sink=${CMAKE_SOURCE_DIR}/AlphaComplexUT.xml --log_level=test_suite --report_level=no)
+  gudhi_add_coverage_test(Alpha_complex_unit_test)
 
 endif (NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.7.0)