diff options
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 2 | ||||
| -rw-r--r-- | mesonbuild/scripts/coverage.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 17bc86c..9284f8a 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -668,7 +668,7 @@ int dummy; elem.add_item('COMMAND', command) elem.add_item('DESC', 'Generating HTML coverage report.') elem.write(outfile) - elif gcovr_exe and gcovr_3_1: + elif gcovr_exe and gcovr_new_rootdir: added_rule = True htmloutdir = os.path.join(self.environment.get_log_dir(), 'coveragereport') phony_elem = NinjaBuildElement(self.all_outputs, 'meson-coverage-html', 'phony', os.path.join(htmloutdir, 'index.html')) diff --git a/mesonbuild/scripts/coverage.py b/mesonbuild/scripts/coverage.py index 4b4b7fb..2d1f8c3 100644 --- a/mesonbuild/scripts/coverage.py +++ b/mesonbuild/scripts/coverage.py @@ -70,7 +70,7 @@ def coverage(source_root, build_root, log_dir): '--show-details', '--branch-coverage', covinfo]) - elif gcovr_exe and gcovr_3_1: + elif gcovr_exe and gcovr_new_rootdir: htmloutdir = os.path.join(log_dir, 'coveragereport') subprocess.check_call([gcovr_exe, '--html', @@ -84,7 +84,7 @@ def coverage(source_root, build_root, log_dir): pathlib.Path(log_dir, 'coverage.xml').as_uri()) print('Text coverage report can be found at', pathlib.Path(log_dir, 'coverage.txt').as_uri()) - if (lcov_exe and genhtml_exe) or (gcovr_exe and gcovr_3_1): + if (lcov_exe and genhtml_exe) or (gcovr_exe and gcovr_new_rootdir): print('Html coverage report can be found at', pathlib.Path(htmloutdir, 'index.html').as_uri()) return 0 |