diff options
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rwxr-xr-x | scripts/cpplint_to_cppcheckxml.py | 15 | ||||
| -rw-r--r-- | src/Alpha_shapes/test/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/Bottleneck/test/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/Persistent_cohomology/test/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/Simplex_tree/test/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/Skeleton_blocker/test/CMakeLists.txt | 2 |
7 files changed, 28 insertions, 10 deletions
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('''<?xml version="1.0" encoding="UTF-8"?>\n''') - sys.stderr.write('''<results>\n''') + # VR : sys.stderr.write('''<results>\n''') + # Add from VR + [ + sys.stderr.write('''<results version=2>\n''') + sys.stderr.write('''<cppcheck version="1.63"/>\n''') + sys.stderr.write('''<errors>\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('''<error file="%s" line="%s" id="%s" severity="%s" msg="%s"/>\n'''%(fname, lineno, label, severity, msg)) + # VR : sys.stderr.write('''<error file="%s" line="%s" id="%s" severity="%s" msg="%s"/>\n'''%(fname, lineno, label, severity, msg)) + # Add from VR + [ + sys.stderr.write('''<error file="%s" line="%s" id="%s" severity="%s" msg="%s"/>\n</error>\n'''%(fname, lineno, label, severity, msg)) + # -] # Write footer + # Add from VR + [ + sys.stderr.write('''</errors>\n'''%(fname, lineno, label, severity, msg)) + # -] sys.stderr.write('''</results>\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") |