diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2019-04-24 23:18:18 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-24 23:18:18 +0300 |
| commit | 25931abb262d2e19d43c8b557df02f1e29857440 (patch) | |
| tree | 37864769adec5c944ed2cbf61bd9c575044cb317 /mesonbuild/environment.py | |
| parent | 8018ef6ac6dead04f9a9f37bed3b47237b90ebad (diff) | |
| parent | ccaa61ec52b97e1cbd8cd0f8986f005ae648a3ba (diff) | |
| download | meson-25931abb262d2e19d43c8b557df02f1e29857440.zip meson-25931abb262d2e19d43c8b557df02f1e29857440.tar.gz meson-25931abb262d2e19d43c8b557df02f1e29857440.tar.bz2 | |
Merge pull request #5319 from kjerstadius/gcovr-4.2
Gcovr 4.2
Diffstat (limited to 'mesonbuild/environment.py')
| -rw-r--r-- | mesonbuild/environment.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index c296573..3d5d3ab 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -83,7 +83,7 @@ from .compilers import ( build_filename = 'meson.build' -def detect_gcovr(version='3.1', log=False): +def detect_gcovr(min_version='3.3', new_rootdir_version='4.2', log=False): gcovr_exe = 'gcovr' try: p, found = Popen_safe([gcovr_exe, '--version'])[0:2] @@ -91,10 +91,10 @@ def detect_gcovr(version='3.1', log=False): # Doesn't exist in PATH or isn't executable return None, None found = search_version(found) - if p.returncode == 0: + if p.returncode == 0 and mesonlib.version_compare(found, '>=' + min_version): if log: 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, '>=' + new_rootdir_version) return None, None def find_coverage_tools(): |