diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 669dfffd58b9b83fbc2e568751c947a9609ca8f7..aa52dd3f38b47442e0c1d3697735b2306dfc0d22 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -479,7 +479,7 @@ coverage: - ctest -j4 - cmake --build . --target coverage - tar czf coverage-report.tar.gz coverage-report - coverage: '/^.*functions\.+:\s(.*\%)\s/' + coverage: '/^.*lines\.+:\s(.*\%)\s/' rules: - if: '$CI_MERGE_REQUEST_LABELS =~ /Ready for code review/' # run on merge requests, if label 'Ready for code review' is set - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH diff --git a/CMakeLists.txt b/CMakeLists.txt index b2025647ecc118d5a38e078c41e571375183ffd4..f5ee1a4f2b5ff1568613b420eb7d397b0643dec2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -164,7 +164,11 @@ if (CMAKE_BUILD_TYPE STREQUAL Coverage) add_custom_command ( OUTPUT coverage.info COMMAND ${LCOV_BIN_DIR}/lcov -q --remove raw-coverage.info "*/usr/*" "/usr/*" --output-file coverage2.info - COMMAND ${LCOV_BIN_DIR}/lcov --remove coverage2.info "*/externals/*" "*/tests/*" "*/sibyll2.3d.cpp" "*/.conan/*" "*/include/Pythia8/*" "${CMAKE_SOURCE_DIR}/modules/*" "${CMAKE_BINARY_DIR}/modules/*" --output-file coverage.info + COMMAND ${LCOV_BIN_DIR}/lcov --remove coverage2.info + "*/externals/*" "*/tests/*" "*/sibyll2.3d.cpp" "*/.conan/*" + "*/include/Pythia8/*" "*/install/*" "${CMAKE_SOURCE_DIR}/modules/*" + "${CMAKE_BINARY_DIR}/modules/*" + --output-file coverage.info COMMAND ${CMAKE_COMMAND} -E remove coverage2.info DEPENDS raw-coverage.info )