From 4e1b229b37dcdf18cff11da377e47b1911a77868 Mon Sep 17 00:00:00 2001 From: Joel Klinghed Date: Mon, 12 Mar 2018 22:19:53 +0100 Subject: fixup! Allow gcovr >= 3.1 to be used to generate html coverage report Rename gcovr_3_1 to gcovr_new_rootdir --- run_unittests.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'run_unittests.py') 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 -- cgit v1.1