Skip to content

Commit 60ff408

Browse files
committed
Work around gcovr issue
1 parent 73b9ef3 commit 60ff408

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

.gitlab-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ Ubuntu_GCC_preprocess:
8888
- if [[ "${BUILD_TESTS_ONLY}" && ! "${BUILD_WITH_CODE_COVERAGE}" ]]; then ./openmw_settings_access_benchmark; fi
8989
- ccache -svv
9090
- df -h
91-
- if [[ "${BUILD_WITH_CODE_COVERAGE}" ]]; then ~/.local/bin/gcovr --xml-pretty --exclude-unreachable-branches --gcov-ignore-parse-errors=negative_hits.warn_once_per_file --print-summary --root "${CI_PROJECT_DIR}" -j $(nproc) -o ../coverage.xml; fi
91+
- if [[ "${BUILD_WITH_CODE_COVERAGE}" ]]; then ~/.local/bin/gcovr --merge-mode-functions merge-use-line-max --xml-pretty --exclude-unreachable-branches --gcov-ignore-parse-errors=negative_hits.warn_once_per_file --print-summary --root "${CI_PROJECT_DIR}" -j $(nproc) -o ../coverage.xml; fi
9292
# this line must be updated when artifacts are added or they'll be deleted, but if we get rid of it, we run out of disk space while archiving
9393
- find * -type f | grep -v -e '^extern/' -e '^install/' -e 'CMakeCache\.txt$' -e '^components-tests.xml$' -e '^openmw-tests.xml$' -e '^openmw-cs-tests.xml$' | xargs rm -f
9494
- cd ..
@@ -425,7 +425,7 @@ Ubuntu_Clang:
425425
CTCACHE_CLANG_TIDY: /usr/bin/clang-tidy-19
426426
CTCACHE_SAVE_OUTPUT: 1
427427
CTCACHE_DIR: $CI_PROJECT_DIR/ctcache
428-
428+
429429
CMAKE_CXX_CLANG_TIDY: 'clang_tidy_cache.py;$CTCACHE_CLANG_TIDY'
430430
script:
431431
- mkdir -pv "${CCACHE_DIR}"

0 commit comments

Comments
 (0)