Skip to content

Commit 2652fb0

Browse files
committed
Ignore some geninfo errors when generating coverage
1 parent dd19702 commit 2652fb0

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

.github/workflows/code-coverage.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2020-2024 Morwenn
1+
# Copyright (c) 2020-2025 Morwenn
22
# SPDX-License-Identifier: MIT
33

44
name: Coverage Upload to Codecov
@@ -35,6 +35,7 @@ jobs:
3535
cmake -H${{github.event.repository.name}} -Bbuild
3636
-DCMAKE_BUILD_TYPE=Debug
3737
-DCPPSORT_ENABLE_COVERAGE=ON
38+
-DGENINFO_EXTRA_FLAGS="--ignore-errors mismatch"
3839
-G"Unix Makefiles"
3940
4041
- name: Build with coverage

cmake/FindLcov.cmake

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,8 @@ if (GENINFO_BIN AND NOT DEFINED GENINFO_EXTERN_FLAG)
7777
CACHE STRING "Geninfo flag to exclude system sources.")
7878
endif ()
7979

80+
set(GENINFO_EXTRA_FLAGS "" CACHE STRING "Flags to add to invocation of geninfo.")
81+
8082
# If Lcov was not found, exit module now.
8183
if (NOT LCOV_FOUND)
8284
return()
@@ -171,7 +173,8 @@ function (lcov_capture_initial_tgt TNAME)
171173
add_custom_command(OUTPUT ${OUTFILE} COMMAND ${GCOV_ENV} ${GENINFO_BIN}
172174
--quiet --base-directory ${PROJECT_SOURCE_DIR} --initial
173175
--gcov-tool ${GCOV_BIN} --output-filename ${OUTFILE}
174-
${GENINFO_EXTERN_FLAG} ${TDIR}/${FILE}.gcno
176+
${GENINFO_EXTRA_FLAGS} ${GENINFO_EXTERN_FLAG}
177+
${TDIR}/${FILE}.gcno
175178
DEPENDS ${TNAME}
176179
COMMENT "Capturing initial coverage data for ${FILE}"
177180
)
@@ -272,7 +275,7 @@ function (lcov_capture_tgt TNAME)
272275
&& ${GCOV_ENV} ${GENINFO_BIN} --quiet --base-directory
273276
${PROJECT_SOURCE_DIR} --gcov-tool ${GCOV_BIN}
274277
--output-filename ${OUTFILE} ${GENINFO_EXTERN_FLAG}
275-
${TDIR}/${FILE}.gcda
278+
${GENINFO_EXTRA_FLAGS} ${TDIR}/${FILE}.gcda
276279
|| cp ${OUTFILE}.init ${OUTFILE}
277280
DEPENDS ${TNAME} ${TNAME}-capture-init "${TDIR}/${FILE}.gcda"
278281
COMMENT "Capturing coverage data for ${FILE}"

0 commit comments

Comments
 (0)