diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2020-04-14 12:45:14 -0700 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2020-04-17 10:49:08 -0700 |
| commit | a3f39fde1bca9993450535fa738b5c1820522c0f (patch) | |
| tree | 2f3798951a42523434f99d365810de89384c0acb | |
| parent | d887a8faff9d2110d34c135a89ef3b43c19630b6 (diff) | |
| download | meson-a3f39fde1bca9993450535fa738b5c1820522c0f.zip meson-a3f39fde1bca9993450535fa738b5c1820522c0f.tar.gz meson-a3f39fde1bca9993450535fa738b5c1820522c0f.tar.bz2 | |
run_project_tests: Allow matrix tests to skip
Since they generate some tests that are only valid on specific operating
systems.
| -rwxr-xr-x | run_project_tests.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/run_project_tests.py b/run_project_tests.py index 15ee21c..875a522 100755 --- a/run_project_tests.py +++ b/run_project_tests.py @@ -734,7 +734,11 @@ def skippable(suite, test): # Scientific libraries are skippable on certain systems # See the discussion here: https://github.com/mesonbuild/meson/pull/6562 - if any([test.endswith(x) for x in ['17 mpi', '25 hdf5', '30 scalapack']]) and skip_scientific: + if any([x in test for x in ['17 mpi', '25 hdf5', '30 scalapack']]) and skip_scientific: + return True + + # These create OS specific tests, and need to be skippable + if any([x in test for x in ['16 sdl', '17 mpi']]): return True # No frameworks test should be skipped on linux CI, as we expect all |