diff options
| author | Joel Klinghed <the_jk@spawned.biz> | 2018-03-12 22:18:26 +0100 |
|---|---|---|
| committer | Joel Klinghed <the_jk@spawned.biz> | 2018-03-12 22:18:26 +0100 |
| commit | ed8197207ec31f8e084c0646a520df32302f13c5 (patch) | |
| tree | 86ebc43d6795d6b4375f02522dc967a96cabb54c /mesonbuild/environment.py | |
| parent | 6266089866469c2a2d298b79df74d2aad86bbeea (diff) | |
| download | meson-ed8197207ec31f8e084c0646a520df32302f13c5.zip meson-ed8197207ec31f8e084c0646a520df32302f13c5.tar.gz meson-ed8197207ec31f8e084c0646a520df32302f13c5.tar.bz2 | |
fixup! Fix coverage-xml and coverage-text targets for gcovr >= 3.1
Rename gcovr_3_1 to gcovr_new_rootdir
Diffstat (limited to 'mesonbuild/environment.py')
| -rw-r--r-- | mesonbuild/environment.py | 4 |
1 files changed, 2 insertions, 2 deletions
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']: |