aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/environment.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2020-06-18 18:57:25 +0300
committerGitHub <noreply@github.com>2020-06-18 18:57:25 +0300
commit1309b0618344a443ea9e298e0916eb0d2cd34d79 (patch)
tree17964dc785d9d234aef5385d5d487ae71a8ba173 /mesonbuild/environment.py
parent96609da8d26fc05be8845c1edf05c8aa38af047d (diff)
parent8620ca2066d04b0d61c8f9fc60c218c779bd11fb (diff)
downloadmeson-1309b0618344a443ea9e298e0916eb0d2cd34d79.zip
meson-1309b0618344a443ea9e298e0916eb0d2cd34d79.tar.gz
meson-1309b0618344a443ea9e298e0916eb0d2cd34d79.tar.bz2
Merge pull request #7196 from cconverse711/llvm-cov
coverage: llvm-cov support
Diffstat (limited to 'mesonbuild/environment.py')
-rw-r--r--mesonbuild/environment.py11
1 files changed, 10 insertions, 1 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index c02376e..afc2a63 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
@@ -134,9 +134,18 @@ def detect_gcovr(min_version='3.3', new_rootdir_version='4.2', log=False):
return gcovr_exe, mesonlib.version_compare(found, '>=' + new_rootdir_version)
return None, None
+def detect_llvm_cov():
+ tools = get_llvm_tool_names('llvm-cov')
+ for tool in tools:
+ if mesonlib.exe_exists([tool, '--version']):
+ return tool
+ return None
+
def find_coverage_tools():
gcovr_exe, gcovr_new_rootdir = detect_gcovr()
+ llvm_cov_exe = detect_llvm_cov()
+
lcov_exe = 'lcov'
genhtml_exe = 'genhtml'
@@ -145,7 +154,7 @@ def find_coverage_tools():
if not mesonlib.exe_exists([genhtml_exe, '--version']):
genhtml_exe = None
- return gcovr_exe, gcovr_new_rootdir, lcov_exe, genhtml_exe
+ return gcovr_exe, gcovr_new_rootdir, lcov_exe, genhtml_exe, llvm_cov_exe
def detect_ninja(version: str = '1.7', log: bool = False) -> str:
r = detect_ninja_command_and_version(version, log)