From 390c6956f7a30221212c59b17b3fb646cdf12a79 Mon Sep 17 00:00:00 2001 From: David Declerck Date: Fri, 23 May 2025 15:45:42 +0200 Subject: [PATCH] Fix coverage for recent lcov (>= 2) --- .github/workflows/build_nightly.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build_nightly.yml b/.github/workflows/build_nightly.yml index 72a990e21..a653d6834 100644 --- a/.github/workflows/build_nightly.yml +++ b/.github/workflows/build_nightly.yml @@ -500,10 +500,7 @@ jobs: coverage: name: Coverage and Warnings needs: build -# Since the latest Ubuntu image, lcov fails complaining about negative branch counts, -# and using fprofile-update=atomic as suggested does not help, so use the previous image -# runs-on: ubuntu-latest - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest timeout-minutes: 10 steps: @@ -551,6 +548,8 @@ jobs: # make -C _build check-code-coverage # <- (ignores errors) make -C _build check TESTSUITEFLAGS="--jobs=$(($(nproc)+1))" make -C _build code-coverage-capture \ + CODE_COVERAGE_LCOV_SHOPTS_DEFAULT="--rc branch_coverage=1" \ + CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT="--rc branch_coverage=1" \ CODE_COVERAGE_DIRECTORY="$(realpath .)/_build" - name: Upload testsuite.log @@ -576,7 +575,9 @@ jobs: - name: Extended coverage run: | make -C _build test --jobs=$(($(nproc)+1)) --keep-going - make -C _build code-coverage-capture \ + make -C _build code-coverage-capture \ + CODE_COVERAGE_LCOV_SHOPTS_DEFAULT="--rc branch_coverage=1" \ + CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT="--rc branch_coverage=1" \ CODE_COVERAGE_OUTPUT_DIRECTORY=extended-coverage \ CODE_COVERAGE_OUTPUT_FILE=extended-coverage.info \ CODE_COVERAGE_DIRECTORY="$(realpath .)/_build"