diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2020-01-27 19:32:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-27 19:32:46 +0200 |
| commit | a493761d89d87e06e787492ba7f9685df6578902 (patch) | |
| tree | 8765fbb1fde9effec8c4325237f534294270554e /run_project_tests.py | |
| parent | a51c9af921d0ba05aa173b8a1a4351eacb575be0 (diff) | |
| parent | 375a51712b0ac01c2aa055f0198abba4b9ca4a34 (diff) | |
| download | meson-a493761d89d87e06e787492ba7f9685df6578902.zip meson-a493761d89d87e06e787492ba7f9685df6578902.tar.gz meson-a493761d89d87e06e787492ba7f9685df6578902.tar.bz2 | |
Merge pull request #6432 from mensinda/cmExeRefactor
cmake: Refactor CMakeExecutor and CMakeTraceParser
Diffstat (limited to 'run_project_tests.py')
| -rwxr-xr-x | run_project_tests.py | 4 |
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, }, ] |