diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2020-06-14 11:44:59 +0200 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2020-06-15 05:46:25 +0000 |
| commit | a44dc67cb7533592f86fd2b4f3ae979f5a901405 (patch) | |
| tree | ccbf3ce05ef6240b7a367b62fa156c0c8289ee49 /run_project_tests.py | |
| parent | eab0e5a8b3a575ead36fa99ac9154d6e960d4525 (diff) | |
| download | meson-a44dc67cb7533592f86fd2b4f3ae979f5a901405.zip meson-a44dc67cb7533592f86fd2b4f3ae979f5a901405.tar.gz meson-a44dc67cb7533592f86fd2b4f3ae979f5a901405.tar.bz2 | |
ci: Use test.json to skip VS2017 azure tests
See also #7307 #7314 #7316
cc @nirbheek
Diffstat (limited to 'run_project_tests.py')
| -rwxr-xr-x | run_project_tests.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/run_project_tests.py b/run_project_tests.py index 088241b..0879e2d 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -669,11 +669,6 @@ def gather_tests(testdir: Path, stdout_mandatory: bool) -> T.List[TestDef]: assert "val" in i skip = False - # Add an empty matrix entry - if i['val'] is None: - tmp_opts += [(None, False)] - continue - # Skip the matrix entry if environment variable is present if 'skip_on_env' in i: for skip_env_var in i['skip_on_env']: @@ -687,6 +682,11 @@ def gather_tests(testdir: Path, stdout_mandatory: bool) -> T.List[TestDef]: skip = True break + # Add an empty matrix entry + if i['val'] is None: + tmp_opts += [(None, skip)] + continue + tmp_opts += [('{}={}'.format(key, i['val']), skip)] if opt_list: |