From 2ce2ed92a4400ecaaa6aac813e206d08b0b1f029 Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Wed, 19 Apr 2017 08:49:23 +0000 Subject: 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 --- src/Spatial_searching/example/CMakeLists.txt | 16 ++++++---------- src/Spatial_searching/test/CMakeLists.txt | 15 +++------------ 2 files changed, 9 insertions(+), 22 deletions(-) (limited to 'src/Spatial_searching') diff --git a/src/Spatial_searching/example/CMakeLists.txt b/src/Spatial_searching/example/CMakeLists.txt index 6238a0ec..f4b9f3cb 100644 --- a/src/Spatial_searching/example/CMakeLists.txt +++ b/src/Spatial_searching/example/CMakeLists.txt @@ -1,13 +1,9 @@ cmake_minimum_required(VERSION 2.6) project(Spatial_searching_examples) -if(CGAL_FOUND) - if (NOT CGAL_VERSION VERSION_LESS 4.8.1) - if (EIGEN3_FOUND) - add_executable( Spatial_searching_example_spatial_searching example_spatial_searching.cpp ) - target_link_libraries(Spatial_searching_example_spatial_searching ${CGAL_LIBRARY}) - add_test(Spatial_searching_example_spatial_searching - ${CMAKE_CURRENT_BINARY_DIR}/Spatial_searching_example_spatial_searching) - endif() - endif() -endif() +if(NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1) + add_executable( Spatial_searching_example_spatial_searching example_spatial_searching.cpp ) + target_link_libraries(Spatial_searching_example_spatial_searching ${CGAL_LIBRARY}) + add_test(NAME Spatial_searching_example_spatial_searching + COMMAND $) +endif(NOT CGAL_WITH_EIGEN3_VERSION VERSION_LESS 4.8.1) diff --git a/src/Spatial_searching/test/CMakeLists.txt b/src/Spatial_searching/test/CMakeLists.txt index bdc95e4a..2502ea5e 100644 --- a/src/Spatial_searching/test/CMakeLists.txt +++ b/src/Spatial_searching/test/CMakeLists.txt @@ -1,21 +1,12 @@ cmake_minimum_required(VERSION 2.6) project(Spatial_searching_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( Spatial_searching_test_Kd_tree_search test_Kd_tree_search.cpp ) target_link_libraries(Spatial_searching_test_Kd_tree_search ${CGAL_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}) - add_test(Spatial_searching_test_Kd_tree_search ${CMAKE_CURRENT_BINARY_DIR}/Spatial_searching_test_Kd_tree_search - # XML format for Jenkins xUnit plugin - --log_format=XML --log_sink=${CMAKE_SOURCE_DIR}/Spatial_searching_UT.xml --log_level=test_suite --report_level=no) + gudhi_add_coverage_test(Spatial_searching_test_Kd_tree_search) endif () -- cgit v1.2.3