From 8c2ccb823c2392e921e7af8ae12d2093695fb646 Mon Sep 17 00:00:00 2001
From: ralfulrich <ralf.ulrich@kit.edu>
Date: Tue, 6 Apr 2021 17:29:46 +0200
Subject: [PATCH] better exclude patterns for coverage
---
.gitlab-ci.yml | 2 +-
CMakeLists.txt | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 669dfffd5..aa52dd3f3 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 b2025647e..f5ee1a4f2 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
)
--
GitLab