diff options
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 4 | ||||
| -rw-r--r-- | mesonbuild/environment.py | 4 | ||||
| -rw-r--r-- | mesonbuild/scripts/coverage.py | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 54d1545..17bc86c 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -628,11 +628,11 @@ int dummy; self.generate_coverage_legacy_rules(outfile) def generate_coverage_legacy_rules(self, outfile): - (gcovr_exe, gcovr_3_1, lcov_exe, genhtml_exe) = environment.find_coverage_tools() + (gcovr_exe, gcovr_new_rootdir, lcov_exe, genhtml_exe) = environment.find_coverage_tools() added_rule = False if gcovr_exe: # gcovr >= 3.1 interprets rootdir differently - if gcovr_3_1: + if gcovr_new_rootdir: rootdir = self.environment.get_build_dir() else: rootdir = self.environment.get_source_dir(), diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 099a3b3..2bec46b 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -91,7 +91,7 @@ def detect_gcovr(version='3.1', log=False): return gcovr_exe, mesonlib.version_compare(found, '>=' + version) def find_coverage_tools(): - gcovr_exe, gcovr_3_1 = detect_gcovr() + gcovr_exe, gcovr_new_rootdir = detect_gcovr() lcov_exe = 'lcov' genhtml_exe = 'genhtml' @@ -101,7 +101,7 @@ def find_coverage_tools(): if not mesonlib.exe_exists([genhtml_exe, '--version']): genhtml_exe = None - return gcovr_exe, gcovr_3_1, lcov_exe, genhtml_exe + return gcovr_exe, gcovr_new_rootdir, lcov_exe, genhtml_exe def detect_ninja(version='1.5', log=False): for n in ['ninja', 'ninja-build']: diff --git a/mesonbuild/scripts/coverage.py b/mesonbuild/scripts/coverage.py index 564286a..4b4b7fb 100644 --- a/mesonbuild/scripts/coverage.py +++ b/mesonbuild/scripts/coverage.py @@ -17,10 +17,10 @@ from mesonbuild import environment import sys, os, subprocess, pathlib def coverage(source_root, build_root, log_dir): - (gcovr_exe, gcovr_3_1, lcov_exe, genhtml_exe) = environment.find_coverage_tools() + (gcovr_exe, gcovr_new_rootdir, lcov_exe, genhtml_exe) = environment.find_coverage_tools() if gcovr_exe: # gcovr >= 3.1 interprets rootdir differently - if gcovr_3_1: + if gcovr_new_rootdir: rootdir = build_root else: rootdir = source_root |