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
pull/4358/head
Mohammed Sadiq 7 years ago committed by Jussi Pakkanen
parent bb9f60624b
commit 25fef3d1fa
  1. 3
      mesonbuild/scripts/coverage.py

@ -77,16 +77,19 @@ def coverage(outputs, source_root, subproject_root, build_root, log_dir):
subprocess.check_call([lcov_exe, subprocess.check_call([lcov_exe,
'-a', initial_tracefile, '-a', initial_tracefile,
'-a', run_tracefile, '-a', run_tracefile,
'--rc', 'lcov_branch_coverage=1',
'-o', raw_tracefile]) '-o', raw_tracefile])
# Remove all directories outside the source_root from the covinfo # Remove all directories outside the source_root from the covinfo
subprocess.check_call([lcov_exe, subprocess.check_call([lcov_exe,
'--extract', raw_tracefile, '--extract', raw_tracefile,
os.path.join(source_root, '*'), os.path.join(source_root, '*'),
'--rc', 'lcov_branch_coverage=1',
'--output-file', covinfo]) '--output-file', covinfo])
# Remove all directories inside subproject dir # Remove all directories inside subproject dir
subprocess.check_call([lcov_exe, subprocess.check_call([lcov_exe,
'--remove', covinfo, '--remove', covinfo,
os.path.join(subproject_root, '*'), os.path.join(subproject_root, '*'),
'--rc', 'lcov_branch_coverage=1',
'--output-file', covinfo]) '--output-file', covinfo])
subprocess.check_call([genhtml_exe, subprocess.check_call([genhtml_exe,
'--prefix', build_root, '--prefix', build_root,

Loading…
Cancel
Save