Merge branch 'move-lcovrc' into 'main'

build: Move lcovrc file to root so it’s picked up by Meson

See merge request GNOME/glib!2630
This commit is contained in:
Sebastian Dröge 2022-04-29 08:01:15 +00:00
commit 42da5c454c
4 changed files with 7 additions and 7 deletions

View File

@ -95,9 +95,9 @@ fedora-x86_64:
_build
- ninja -C _build
- mkdir -p _coverage
- lcov --config-file .gitlab-ci/lcovrc --directory _build --capture --initial --output-file "_coverage/${CI_JOB_NAME}-baseline.lcov"
- lcov --config-file .lcovrc --directory _build --capture --initial --output-file "_coverage/${CI_JOB_NAME}-baseline.lcov"
- .gitlab-ci/run-tests.sh
- lcov --config-file .gitlab-ci/lcovrc --directory _build --capture --output-file "_coverage/${CI_JOB_NAME}.lcov"
- lcov --config-file .lcovrc --directory _build --capture --output-file "_coverage/${CI_JOB_NAME}.lcov"
artifacts:
reports:
junit: "_build/${CI_JOB_NAME}-report.xml"

View File

@ -7,14 +7,14 @@ python3 ./.gitlab-ci/fixup-cov-paths.py _coverage/*.lcov
for path in _coverage/*.lcov; do
# Remove coverage from generated code in the build directory
lcov --config-file .gitlab-ci/lcovrc -r "${path}" '*/_build/*' -o "$(pwd)/${path}"
lcov --config-file .lcovrc -r "${path}" '*/_build/*' -o "$(pwd)/${path}"
# Remove any coverage from system files
lcov --config-file .gitlab-ci/lcovrc -e "${path}" "$(pwd)/*" -o "$(pwd)/${path}"
lcov --config-file .lcovrc -e "${path}" "$(pwd)/*" -o "$(pwd)/${path}"
done
genhtml \
--ignore-errors=source \
--config-file .gitlab-ci/lcovrc \
--config-file .lcovrc \
_coverage/*.lcov \
-o _coverage/coverage

View File

@ -44,7 +44,7 @@ ninja
lcov \
--quiet \
--config-file "${DIR}"/.gitlab-ci/lcovrc \
--config-file "${DIR}"/.lcovrc \
--directory "${DIR}/_build" \
--capture \
--initial \
@ -61,7 +61,7 @@ python3 "${DIR}"/.gitlab-ci/meson-junit-report.py \
lcov \
--quiet \
--config-file "${DIR}"/.gitlab-ci/lcovrc \
--config-file "${DIR}"/.lcovrc \
--directory "${DIR}/_build" \
--capture \
--output-file "${DIR}/_coverage/${CI_JOB_NAME}.lcov"