Remove all files outside the source directory from the coverage report

Cuurently, a set of directories is filtered out from the output based on
the location of system includes on most common linux distro's. This
commit does away with the blacklist and implements a whitelist approach:
only the files inside the source root are shown.
pull/3031/head
Henk van der Laan 7 years ago committed by Jussi Pakkanen
parent 7bfcf68777
commit 0e07f1a896
  1. 17
      mesonbuild/scripts/coverage.py

@ -16,11 +16,6 @@ from mesonbuild import environment
import sys, os, subprocess, pathlib import sys, os, subprocess, pathlib
def remove_dir_from_trace(lcov_command, covfile, dirname):
tmpfile = covfile + '.tmp'
subprocess.check_call([lcov_command, '--remove', covfile, dirname, '-o', tmpfile])
os.replace(tmpfile, covfile)
def coverage(source_root, build_root, log_dir): def coverage(source_root, build_root, log_dir):
(gcovr_exe, lcov_exe, genhtml_exe) = environment.find_coverage_tools() (gcovr_exe, lcov_exe, genhtml_exe) = environment.find_coverage_tools()
if gcovr_exe: if gcovr_exe:
@ -38,6 +33,7 @@ def coverage(source_root, build_root, log_dir):
covinfo = os.path.join(log_dir, 'coverage.info') covinfo = os.path.join(log_dir, 'coverage.info')
initial_tracefile = covinfo + '.initial' initial_tracefile = covinfo + '.initial'
run_tracefile = covinfo + '.run' run_tracefile = covinfo + '.run'
raw_tracefile = covinfo + '.raw'
subprocess.check_call([lcov_exe, subprocess.check_call([lcov_exe,
'--directory', build_root, '--directory', build_root,
'--capture', '--capture',
@ -55,11 +51,12 @@ def coverage(source_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,
'-o', covinfo]) '-o', raw_tracefile])
remove_dir_from_trace(lcov_exe, covinfo, '/usr/include/*') # Remove all directories outside the source_root from the covinfo
remove_dir_from_trace(lcov_exe, covinfo, '/usr/local/include/*') subprocess.check_call([lcov_exe,
remove_dir_from_trace(lcov_exe, covinfo, '/usr/src/*') '--extract', raw_tracefile,
remove_dir_from_trace(lcov_exe, covinfo, '/usr/lib/llvm-*/include/*') os.path.join(source_root, '*'),
'--output-file', covinfo])
subprocess.check_call([genhtml_exe, subprocess.check_call([genhtml_exe,
'--prefix', build_root, '--prefix', build_root,
'--output-directory', htmloutdir, '--output-directory', htmloutdir,

Loading…
Cancel
Save