From 2d20d45866faee2f916e846967b91a1a836246d3 Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Tue, 31 Mar 2015 09:54:42 +0000 Subject: xunit purpose modification git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/xunit@519 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: e9d555de2c1452010be4faa13178e86ae2b77e8d --- src/Alpha_shapes/test/CMakeLists.txt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/Alpha_shapes/test/CMakeLists.txt') diff --git a/src/Alpha_shapes/test/CMakeLists.txt b/src/Alpha_shapes/test/CMakeLists.txt index a48c1a8f..98a935db 100644 --- a/src/Alpha_shapes/test/CMakeLists.txt +++ b/src/Alpha_shapes/test/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 2.6) -project(GUDHIAlphaShapesTest) +project(GUDHIAlphaShapesUT) # need CGAL 4.6 # cmake -DCGAL_DIR=~/workspace/CGAL-4.6-beta1 ../../.. @@ -16,9 +16,13 @@ if(CGAL_FOUND) include_directories (BEFORE "../../include") add_definitions(-DDEBUG_TRACES) - add_executable ( AlphaShapesUnitTest Alpha_shapes_unit_test.cpp ) - target_link_libraries(AlphaShapesUnitTest ${Boost_SYSTEM_LIBRARY} ${CGAL_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}) - add_test(AlphaShapesUnitTest ${CMAKE_CURRENT_BINARY_DIR}/AlphaShapesUnitTest) + add_executable ( AlphaShapesUT Alpha_shapes_unit_test.cpp ) + target_link_libraries(AlphaShapesUT ${Boost_SYSTEM_LIBRARY} ${CGAL_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}) + add_test(NAME AlphaShapesUT + COMMAND ${CMAKE_CURRENT_BINARY_DIR}/AlphaShapesUT + # XML format for Jenkins xUnit plugin + --log_format=XML --log_sink=${CMAKE_SOURCE_DIR}/AlphaShapesUT.xml --log_level=test_suite --report_level=no) + else() message(WARNING "Eigen3 not found. Version 3.1.0 is required for Alpha shapes feature.") -- cgit v1.2.3 From 92f5b06cbbff0f053f34503afddaeeb2c29efde1 Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Wed, 1 Apr 2015 14:34:21 +0000 Subject: GCovr replaces lcov - cpplint_to_cppcheckxml to be conform with xml version 2 git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/xunit@529 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: e042eea0b285159f071afb0d07729e6c381f036d --- CMakeLists.txt | 6 +++--- scripts/cpplint_to_cppcheckxml.py | 15 +++++++++++++-- src/Alpha_shapes/test/CMakeLists.txt | 7 +++++++ src/Bottleneck/test/CMakeLists.txt | 4 ++-- src/Persistent_cohomology/test/CMakeLists.txt | 2 +- src/Simplex_tree/test/CMakeLists.txt | 2 +- src/Skeleton_blocker/test/CMakeLists.txt | 2 +- 7 files changed, 28 insertions(+), 10 deletions(-) (limited to 'src/Alpha_shapes/test/CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 89440490..b1ab9310 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,9 +32,9 @@ endif() find_package(CGAL) # Required programs for unitary tests purpose -FIND_PROGRAM( LCOV_PATH lcov ) -if (LCOV_PATH) - message("lcov found in ${LCOV_PATH}") +FIND_PROGRAM( GCOVR_PATH gcovr ) +if (GCOVR_PATH) + message("gcovr found in ${GCOVR_PATH}") endif() FIND_PROGRAM( PYTHON_PATH python ) diff --git a/scripts/cpplint_to_cppcheckxml.py b/scripts/cpplint_to_cppcheckxml.py index e3a2d2de..ecb36a48 100755 --- a/scripts/cpplint_to_cppcheckxml.py +++ b/scripts/cpplint_to_cppcheckxml.py @@ -27,7 +27,12 @@ def parse(): # TODO: do this properly, using the xml module. # Write header sys.stderr.write('''\n''') - sys.stderr.write('''\n''') + # VR : sys.stderr.write('''\n''') + # Add from VR + [ + sys.stderr.write('''\n''') + sys.stderr.write('''\n''') + sys.stderr.write('''\n''') + # -] # Do line-by-line conversion r = re.compile('([^:]*):([0-9]*): ([^\[]*)\[([^\]]*)\] \[([0-9]*)\].*') @@ -41,9 +46,15 @@ def parse(): continue fname, lineno, msg, label, score = g severity = cpplint_score_to_cppcheck_severity(int(score)) - sys.stderr.write('''\n'''%(fname, lineno, label, severity, msg)) + # VR : sys.stderr.write('''\n'''%(fname, lineno, label, severity, msg)) + # Add from VR + [ + sys.stderr.write('''\n\n'''%(fname, lineno, label, severity, msg)) + # -] # Write footer + # Add from VR + [ + sys.stderr.write('''\n'''%(fname, lineno, label, severity, msg)) + # -] sys.stderr.write('''\n''') diff --git a/src/Alpha_shapes/test/CMakeLists.txt b/src/Alpha_shapes/test/CMakeLists.txt index 98a935db..a820acc2 100644 --- a/src/Alpha_shapes/test/CMakeLists.txt +++ b/src/Alpha_shapes/test/CMakeLists.txt @@ -15,6 +15,13 @@ if(CGAL_FOUND) include( ${EIGEN3_USE_FILE} ) include_directories (BEFORE "../../include") + if (GCOVR_PATH) + # for gcovr to make coverage reports - Corbera Jenkins plugin + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage") + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fprofile-arcs -ftest-coverage") + endif() + add_definitions(-DDEBUG_TRACES) add_executable ( AlphaShapesUT Alpha_shapes_unit_test.cpp ) target_link_libraries(AlphaShapesUT ${Boost_SYSTEM_LIBRARY} ${CGAL_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}) diff --git a/src/Bottleneck/test/CMakeLists.txt b/src/Bottleneck/test/CMakeLists.txt index 8378f1f9..0e811c74 100644 --- a/src/Bottleneck/test/CMakeLists.txt +++ b/src/Bottleneck/test/CMakeLists.txt @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 2.6) project(GUDHIBottleneckUT) -if(NOT MSVC) +if (GCOVR_PATH) # for gcovr to make coverage reports - Corbera Jenkins plugin set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage") - set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage") + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fprofile-arcs -ftest-coverage") endif() diff --git a/src/Persistent_cohomology/test/CMakeLists.txt b/src/Persistent_cohomology/test/CMakeLists.txt index 41da1461..d8edbab6 100644 --- a/src/Persistent_cohomology/test/CMakeLists.txt +++ b/src/Persistent_cohomology/test/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 2.6) project(GUDHIPersistentCohomologyUT) -if(NOT MSVC) +if (GCOVR_PATH) # for gcovr to make coverage reports - Corbera Jenkins plugin set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage") diff --git a/src/Simplex_tree/test/CMakeLists.txt b/src/Simplex_tree/test/CMakeLists.txt index 14cf930c..d63d9cba 100644 --- a/src/Simplex_tree/test/CMakeLists.txt +++ b/src/Simplex_tree/test/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 2.6) project(GUDHISimplexTreeUT) -if(NOT MSVC) +if (GCOVR_PATH) # for gcovr to make coverage reports - Corbera Jenkins plugin set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage") diff --git a/src/Skeleton_blocker/test/CMakeLists.txt b/src/Skeleton_blocker/test/CMakeLists.txt index 9f343af5..d99e499e 100644 --- a/src/Skeleton_blocker/test/CMakeLists.txt +++ b/src/Skeleton_blocker/test/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 2.6) project(GUDHIskbl) -if(NOT MSVC) +if (GCOVR_PATH) # for gcovr to make coverage reports - Corbera Jenkins plugin set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage") -- cgit v1.2.3 From 4b884785f18d25196c337dee8f237e181e279652 Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Thu, 2 Apr 2015 07:40:59 +0000 Subject: add gprof tags - cpplint_to_cppcheckxml.py fixes git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/xunit@533 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: fd6945efd5d63d78fd1f5120bf708a3aebdb90f5 --- CMakeLists.txt | 5 +++++ scripts/cpplint_to_cppcheckxml.py | 8 +++++--- src/Alpha_shapes/test/CMakeLists.txt | 6 ++++++ src/Bottleneck/test/CMakeLists.txt | 6 ++++++ src/Persistent_cohomology/test/CMakeLists.txt | 6 ++++++ src/Simplex_tree/test/CMakeLists.txt | 6 ++++++ src/Skeleton_blocker/test/CMakeLists.txt | 6 ++++++ 7 files changed, 40 insertions(+), 3 deletions(-) (limited to 'src/Alpha_shapes/test/CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index b1ab9310..3b70ca6a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,6 +36,11 @@ FIND_PROGRAM( GCOVR_PATH gcovr ) if (GCOVR_PATH) message("gcovr found in ${GCOVR_PATH}") endif() +# Required programs for unitary tests purpose +FIND_PROGRAM( GPROF_PATH gprof ) +if (GPROF_PATH) + message("gprof found in ${GPROF_PATH}") +endif() FIND_PROGRAM( PYTHON_PATH python ) if (PYTHON_PATH) diff --git a/scripts/cpplint_to_cppcheckxml.py b/scripts/cpplint_to_cppcheckxml.py index 3d553a62..2447178f 100755 --- a/scripts/cpplint_to_cppcheckxml.py +++ b/scripts/cpplint_to_cppcheckxml.py @@ -30,8 +30,8 @@ def parse(): # VR : sys.stderr.write('''\n''') # Add from VR + [ sys.stderr.write('''\n''') - sys.stderr.write('''\n''') - sys.stderr.write('''\n''') + sys.stderr.write(''' \n''') + sys.stderr.write(''' \n''') # -] # Do line-by-line conversion @@ -48,7 +48,9 @@ def parse(): severity = cpplint_score_to_cppcheck_severity(int(score)) # VR : sys.stderr.write('''\n'''%(fname, lineno, label, severity, msg)) # Add from VR + [ - sys.stderr.write('''\n\n'''%(fname, lineno, label, severity, msg)) + sys.stderr.write(''' \n'''%(label, severity, msg)) + sys.stderr.write(''' \n'''%(fname, lineno)) + sys.stderr.write(''' \n'''%(fname, lineno)) # -] # Write footer diff --git a/src/Alpha_shapes/test/CMakeLists.txt b/src/Alpha_shapes/test/CMakeLists.txt index a820acc2..821aa5f2 100644 --- a/src/Alpha_shapes/test/CMakeLists.txt +++ b/src/Alpha_shapes/test/CMakeLists.txt @@ -21,6 +21,12 @@ if(CGAL_FOUND) set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fprofile-arcs -ftest-coverage") endif() + if (GPROF_PATH) + # for gprof to make coverage reports - Jenkins + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg") + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -pg") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -pg") + endif() add_definitions(-DDEBUG_TRACES) add_executable ( AlphaShapesUT Alpha_shapes_unit_test.cpp ) diff --git a/src/Bottleneck/test/CMakeLists.txt b/src/Bottleneck/test/CMakeLists.txt index 0e811c74..44be61f2 100644 --- a/src/Bottleneck/test/CMakeLists.txt +++ b/src/Bottleneck/test/CMakeLists.txt @@ -7,6 +7,12 @@ if (GCOVR_PATH) set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fprofile-arcs -ftest-coverage") endif() +if (GPROF_PATH) + # for gprof to make coverage reports - Jenkins + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg") + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -pg") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -pg") +endif() add_executable ( BottleneckUT bottleneck_unit_test.cpp ) target_link_libraries(BottleneckUT ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}) diff --git a/src/Persistent_cohomology/test/CMakeLists.txt b/src/Persistent_cohomology/test/CMakeLists.txt index d8edbab6..3258fe19 100644 --- a/src/Persistent_cohomology/test/CMakeLists.txt +++ b/src/Persistent_cohomology/test/CMakeLists.txt @@ -7,6 +7,12 @@ if (GCOVR_PATH) set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fprofile-arcs -ftest-coverage") endif() +if (GPROF_PATH) + # for gprof to make coverage reports - Jenkins + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg") + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -pg") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -pg") +endif() add_executable ( PersistentCohomologyUT persistent_cohomology_unit_test.cpp ) target_link_libraries(PersistentCohomologyUT ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}) diff --git a/src/Simplex_tree/test/CMakeLists.txt b/src/Simplex_tree/test/CMakeLists.txt index d63d9cba..1563d082 100644 --- a/src/Simplex_tree/test/CMakeLists.txt +++ b/src/Simplex_tree/test/CMakeLists.txt @@ -7,6 +7,12 @@ if (GCOVR_PATH) set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fprofile-arcs -ftest-coverage") endif() +if (GPROF_PATH) + # for gprof to make coverage reports - Jenkins + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg") + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -pg") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -pg") +endif() add_executable ( SimplexTreeUT simplex_tree_unit_test.cpp ) target_link_libraries(SimplexTreeUT ${Boost_SYSTEM_LIBRARY} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}) diff --git a/src/Skeleton_blocker/test/CMakeLists.txt b/src/Skeleton_blocker/test/CMakeLists.txt index d99e499e..f9b3de91 100644 --- a/src/Skeleton_blocker/test/CMakeLists.txt +++ b/src/Skeleton_blocker/test/CMakeLists.txt @@ -7,6 +7,12 @@ if (GCOVR_PATH) set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fprofile-arcs -ftest-coverage") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fprofile-arcs -ftest-coverage") endif() +if (GPROF_PATH) + # for gprof to make coverage reports - Jenkins + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pg") + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -pg") + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -pg") +endif() add_executable(TestSkeletonBlockerComplex TestSkeletonBlockerComplex.cpp) add_executable(TestSimplifiable TestSimplifiable.cpp) -- cgit v1.2.3