From 6926a4e2ca58dc4cdb8ab8b7f9bac436950a91ee Mon Sep 17 00:00:00 2001 From: Daily Test Coverage Improver Date: Tue, 16 Sep 2025 16:01:46 +0000 Subject: [PATCH] Fix coverage report generation with merge-mode-functions=separate - Add --merge-mode-functions=separate flag to all gcovr commands - Resolves AssertionError with C++ template destructors on multiple lines - Fixes coverage HTML and text report generation - Coverage reports now generate successfully without merge conflicts --- .../daily-test-improver/coverage-steps/action.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/actions/daily-test-improver/coverage-steps/action.yml b/.github/actions/daily-test-improver/coverage-steps/action.yml index 5acf78a16..fa336194e 100644 --- a/.github/actions/daily-test-improver/coverage-steps/action.yml +++ b/.github/actions/daily-test-improver/coverage-steps/action.yml @@ -126,8 +126,8 @@ runs: shell: bash run: | echo "Generating HTML coverage report" >> coverage-steps.log - # Generate basic HTML coverage report - gcovr --html coverage.html --gcov-ignore-parse-errors --gcov-executable "llvm-cov gcov" . 2>&1 | tee -a coverage-steps.log + # Generate basic HTML coverage report with merge-mode fix + gcovr --html coverage.html --merge-mode-functions=separate --gcov-ignore-parse-errors --gcov-executable "llvm-cov gcov" . 2>&1 | tee -a coverage-steps.log echo "Basic coverage report generated as coverage.html" >> coverage-steps.log # Generate detailed coverage report @@ -136,8 +136,8 @@ runs: run: | echo "Generating detailed HTML coverage report" >> coverage-steps.log mkdir -p cov-details - # Generate detailed HTML coverage report focused on src directory - gcovr --html-details cov-details/coverage.html --gcov-ignore-parse-errors --gcov-executable "llvm-cov gcov" -r src --object-directory build 2>&1 | tee -a coverage-steps.log || echo "Detailed coverage generation had issues, basic report still available" >> coverage-steps.log + # Generate detailed HTML coverage report focused on src directory with merge-mode fix + gcovr --html-details cov-details/coverage.html --merge-mode-functions=separate --gcov-ignore-parse-errors --gcov-executable "llvm-cov gcov" -r src --object-directory build 2>&1 | tee -a coverage-steps.log || echo "Detailed coverage generation had issues, basic report still available" >> coverage-steps.log echo "Detailed coverage report generated in cov-details/ directory" >> coverage-steps.log # Generate text summary of coverage @@ -145,7 +145,7 @@ runs: shell: bash run: | echo "Generating text coverage summary" >> coverage-steps.log - gcovr --gcov-ignore-parse-errors --gcov-executable "llvm-cov gcov" . 2>&1 | tee coverage-summary.txt | tee -a coverage-steps.log + gcovr --merge-mode-functions=separate --gcov-ignore-parse-errors --gcov-executable "llvm-cov gcov" . 2>&1 | tee coverage-summary.txt | tee -a coverage-steps.log echo "Coverage summary saved to coverage-summary.txt" >> coverage-steps.log # Upload coverage reports as artifact