From 375a51712b0ac01c2aa055f0198abba4b9ca4a34 Mon Sep 17 00:00:00 2001 From: Daniel Mensinger Date: Wed, 8 Jan 2020 17:13:55 +0100 Subject: cmake: Some test improvements --- run_project_tests.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'run_project_tests.py') diff --git a/run_project_tests.py b/run_project_tests.py index e480160..acad225 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -856,6 +856,8 @@ def check_format(): continue if 'meson-logs' in root or 'meson-private' in root: continue + if '__CMake_build' in root: + continue if '.eggs' in root or '_cache' in root: # e.g. .mypy_cache continue for fname in filenames: @@ -919,7 +921,7 @@ def print_tool_versions(): { 'tool': 'cmake', 'args': ['--version'], - 'regex': re.compile(r'^cmake version ([0-9]+(\.[0-9]+)*)$'), + 'regex': re.compile(r'^cmake version ([0-9]+(\.[0-9]+)*(-[a-z0-9]+)?)$'), 'match_group': 1, }, ] -- cgit v1.1