diff options
author | Joel Klinghed <the_jk@spawned.biz> | 2018-03-12 22:19:53 +0100 |
---|---|---|
committer | Joel Klinghed <the_jk@spawned.biz> | 2018-03-12 22:19:53 +0100 |
commit | 4e1b229b37dcdf18cff11da377e47b1911a77868 (patch) | |
tree | b96fd51d29ce88adc8391ad231334604079bf678 /run_unittests.py | |
parent | ed8197207ec31f8e084c0646a520df32302f13c5 (diff) | |
download | meson-4e1b229b37dcdf18cff11da377e47b1911a77868.zip meson-4e1b229b37dcdf18cff11da377e47b1911a77868.tar.gz meson-4e1b229b37dcdf18cff11da377e47b1911a77868.tar.bz2 |
fixup! Allow gcovr >= 3.1 to be used to generate html coverage report
Rename gcovr_3_1 to gcovr_new_rootdir
Diffstat (limited to 'run_unittests.py')
-rwxr-xr-x | run_unittests.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/run_unittests.py b/run_unittests.py index 4c48041..deb4204 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -2554,10 +2554,10 @@ class LinuxlikeTests(BasePlatformTests): self.assertIn("-fsanitize=address", i["command"]) def test_coverage(self): - gcovr_exe, gcovr_3_1 = mesonbuild.environment.detect_gcovr() + gcovr_exe, gcovr_new_rootdir = mesonbuild.environment.detect_gcovr() if not gcovr_exe: raise unittest.SkipTest('gcovr not found') - if not shutil.which('genhtml') and not gcovr_3_1: + if not shutil.which('genhtml') and not gcovr_new_rootdir: raise unittest.SkipTest('genhtml not found and gcovr is too old') if 'clang' in os.environ.get('CC', ''): # We need to use llvm-cov instead of gcovr with clang |