fixup! Fix coverage-xml and coverage-text targets for gcovr >= 3.1

Fix fail cases of detect_gcovr
pull/3145/head
Joel Klinghed 7 years ago
parent 4e1b229b37
commit dfc0655bcd
  1. 3
      mesonbuild/environment.py

@ -83,12 +83,13 @@ def detect_gcovr(version='3.1', log=False):
p, found = Popen_safe([gcovr_exe, '--version'])[0:2] p, found = Popen_safe([gcovr_exe, '--version'])[0:2]
except (FileNotFoundError, PermissionError): except (FileNotFoundError, PermissionError):
# Doesn't exist in PATH or isn't executable # Doesn't exist in PATH or isn't executable
return return None, None
found = search_version(found) found = search_version(found)
if p.returncode == 0: if p.returncode == 0:
if log: if log:
mlog.log('Found gcovr-{} at {}'.format(found, shlex.quote(shutil.which(gcovr_exe)))) mlog.log('Found gcovr-{} at {}'.format(found, shlex.quote(shutil.which(gcovr_exe))))
return gcovr_exe, mesonlib.version_compare(found, '>=' + version) return gcovr_exe, mesonlib.version_compare(found, '>=' + version)
return None, None
def find_coverage_tools(): def find_coverage_tools():
gcovr_exe, gcovr_new_rootdir = detect_gcovr() gcovr_exe, gcovr_new_rootdir = detect_gcovr()

Loading…
Cancel
Save