Merge pull request #1880 from DLR-AMR/improve-codecov-for-templated-code

Improvement: Change location of CodeCoverage include in cmake

Author: lenaploetzke

CMakeLists.txt

@@ -91,6 +91,14 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
     "Debug" "Release" "RelWithDebInfo")
 endif()
 
+if( CMAKE_BUILD_TYPE STREQUAL "Debug" )
+  # Option to generate code coverage target.
+  option( T8CODE_CODE_COVERAGE "Enable code coverage reporting" OFF)
+  if(T8CODE_CODE_COVERAGE)
+    include(./cmake/CodeCoverage.cmake)
+  endif()
+endif()
+
 set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
 
 if( T8CODE_BUILD_FORTRAN_INTERFACE )

cmake/CodeCoverage.cmake

@@ -13,8 +13,8 @@
 # Adds compiler flags necessary to be able to collect coverage information.
 # 
 function(append_coverage_compiler_flags)
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g --coverage" PARENT_SCOPE)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g --coverage" PARENT_SCOPE)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g --coverage -O0" PARENT_SCOPE)
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g --coverage -O0" PARENT_SCOPE)
   set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --coverage" PARENT_SCOPE)
   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} --coverage" PARENT_SCOPE)
 endfunction() # append_coverage_compiler_flags
@@ -79,8 +79,6 @@ function(setup_target_for_coverage)
 
     # Generate HTML file using genhtml.
     COMMAND ${GENHTML_PATH} -o ${Coverage_NAME} ${Coverage_NAME}.info
-    # Show result in terminal.
-    COMMAND ${LCOV_PATH} --list ${Coverage_NAME}.info
 
     BYPRODUCTS
       ${Coverage_NAME}.base
@@ -95,9 +93,11 @@ function(setup_target_for_coverage)
 endfunction() # setup_target_for_coverage
 
 # Call functions defined above with customized arguments.
+# Attention: For some gcov versions, you have to add --ignore-errors mismatch to the LCOV_ARGS.
+# This seems to be a common gcov problem.
 append_coverage_compiler_flags()
 setup_target_for_coverage(
   NAME coverage
-  EXCLUDE "${CMAKE_SOURCE_DIR}/sc*"
-  LCOV_ARGS "--no-external"
+  EXCLUDE "${CMAKE_SOURCE_DIR}/sc*" "${CMAKE_SOURCE_DIR}/p4est*" "${CMAKE_SOURCE_DIR}/test*" "${CMAKE_SOURCE_DIR}/thirdparty*" "${CMAKE_SOURCE_DIR}/tutorials*" "${CMAKE_SOURCE_DIR}/example*" "${CMAKE_SOURCE_DIR}/benchmarks*"
+  LCOV_ARGS --no-external --ignore-errors gcov
 )

src/CMakeLists.txt

@@ -41,12 +41,6 @@ if( CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo" )
 endif()
 
 if( CMAKE_BUILD_TYPE STREQUAL "Debug" )
-  # Option to generate code coverage target.
-  option( T8CODE_CODE_COVERAGE "Enable code coverage reporting" OFF)
-  if(T8CODE_CODE_COVERAGE)
-    include(CodeCoverage)
-  endif()
-
   set (T8_CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}")
   set (T8_CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_DEBUG}")