From 25fef3d1facecfb64108ef0a1439d24100593935 Mon Sep 17 00:00:00 2001 From: Mohammed Sadiq Date: Mon, 8 Oct 2018 09:58:48 +0530 Subject: coverage: fix lcov branch coverage generation lcov branch coverage are disabled by default. So branch coverage has to be enabled for every stage to make them work. Fixes https://github.com/mesonbuild/meson/issues/4319 --- mesonbuild/scripts/coverage.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mesonbuild/scripts/coverage.py b/mesonbuild/scripts/coverage.py index 916c84f4d..0509eff6a 100644 --- a/mesonbuild/scripts/coverage.py +++ b/mesonbuild/scripts/coverage.py @@ -77,16 +77,19 @@ def coverage(outputs, source_root, subproject_root, build_root, log_dir): subprocess.check_call([lcov_exe, '-a', initial_tracefile, '-a', run_tracefile, + '--rc', 'lcov_branch_coverage=1', '-o', raw_tracefile]) # Remove all directories outside the source_root from the covinfo subprocess.check_call([lcov_exe, '--extract', raw_tracefile, os.path.join(source_root, '*'), + '--rc', 'lcov_branch_coverage=1', '--output-file', covinfo]) # Remove all directories inside subproject dir subprocess.check_call([lcov_exe, '--remove', covinfo, os.path.join(subproject_root, '*'), + '--rc', 'lcov_branch_coverage=1', '--output-file', covinfo]) subprocess.check_call([genhtml_exe, '--prefix', build_root, -- cgit v1.2.3