diff options
| author | Joel Klinghed <the_jk@spawned.biz> | 2018-03-13 08:31:50 +0100 |
|---|---|---|
| committer | Joel Klinghed <the_jk@spawned.biz> | 2018-03-13 08:31:50 +0100 |
| commit | dfc0655bcd6f00e2711331ddf582d1fa18223d70 (patch) | |
| tree | 2a46ced7ea857709c7e7fc3f3181d04658fef48b | |
| parent | 4e1b229b37dcdf18cff11da377e47b1911a77868 (diff) | |
| download | meson-dfc0655bcd6f00e2711331ddf582d1fa18223d70.zip meson-dfc0655bcd6f00e2711331ddf582d1fa18223d70.tar.gz meson-dfc0655bcd6f00e2711331ddf582d1fa18223d70.tar.bz2 | |
fixup! Fix coverage-xml and coverage-text targets for gcovr >= 3.1
Fix fail cases of detect_gcovr
| -rw-r--r-- | mesonbuild/environment.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 2bec46b..f34a119 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -83,12 +83,13 @@ def detect_gcovr(version='3.1', log=False): p, found = Popen_safe([gcovr_exe, '--version'])[0:2] except (FileNotFoundError, PermissionError): # Doesn't exist in PATH or isn't executable - return + return None, None found = search_version(found) if p.returncode == 0: if log: mlog.log('Found gcovr-{} at {}'.format(found, shlex.quote(shutil.which(gcovr_exe)))) return gcovr_exe, mesonlib.version_compare(found, '>=' + version) + return None, None def find_coverage_tools(): gcovr_exe, gcovr_new_rootdir = detect_gcovr() |