aboutsummaryrefslogtreecommitdiff
path: root/run_project_tests.py
diff options
context:
space:
mode:
authorDaniel Mensinger <daniel@mensinger-ka.de>2020-01-08 17:13:55 +0100
committerDaniel Mensinger <daniel@mensinger-ka.de>2020-01-26 18:23:41 +0100
commit375a51712b0ac01c2aa055f0198abba4b9ca4a34 (patch)
tree3254fd3f52d104780c380ad33d597db5fd0186c7 /run_project_tests.py
parentacc6dbfab7ed58e8c20cd61252d4d111bd9ca642 (diff)
downloadmeson-375a51712b0ac01c2aa055f0198abba4b9ca4a34.zip
meson-375a51712b0ac01c2aa055f0198abba4b9ca4a34.tar.gz
meson-375a51712b0ac01c2aa055f0198abba4b9ca4a34.tar.bz2
cmake: Some test improvements
Diffstat (limited to 'run_project_tests.py')
-rwxr-xr-xrun_project_tests.py4
1 files changed, 3 insertions, 1 deletions
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,
},
]