diff options
author | Jon Turney <jon.turney@dronecode.org.uk> | 2021-06-21 14:06:45 +0100 |
---|---|---|
committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2021-07-07 20:08:12 +0200 |
commit | 609864a66ddc6af559fadadd76a266d64ae9991e (patch) | |
tree | 6c26994e54ebd407bb6ad5d48245573e5e70a262 /test cases | |
parent | 0cd8897189b3d68d500ffcd3f32e0f855ac04337 (diff) | |
download | meson-609864a66ddc6af559fadadd76a266d64ae9991e.zip meson-609864a66ddc6af559fadadd76a266d64ae9991e.tar.gz meson-609864a66ddc6af559fadadd76a266d64ae9991e.tar.bz2 |
Annotate framework tests with where they are expected to skip
Remove hard-coded framework test skip logic in skippable(), instead
annotate test.json with environments in which skip is expected.
(Mainly this is done with by testing the value of MESON_CI_JOBNAME now
set for linux jobs)
Diffstat (limited to 'test cases')
-rw-r--r-- | test cases/frameworks/15 llvm/test.json | 2 | ||||
-rw-r--r-- | test cases/frameworks/16 sdl2/test.json | 2 | ||||
-rw-r--r-- | test cases/frameworks/17 mpi/test.json | 6 | ||||
-rw-r--r-- | test cases/frameworks/25 hdf5/test.json | 3 | ||||
-rw-r--r-- | test cases/frameworks/26 netcdf/test.json | 3 | ||||
-rw-r--r-- | test cases/frameworks/29 blocks/test.json | 3 | ||||
-rw-r--r-- | test cases/frameworks/30 scalapack/test.json | 3 | ||||
-rw-r--r-- | test cases/frameworks/34 gir static lib/test.json | 3 | ||||
-rw-r--r-- | test cases/frameworks/4 qt/test.json | 4 |
9 files changed, 21 insertions, 8 deletions
diff --git a/test cases/frameworks/15 llvm/test.json b/test cases/frameworks/15 llvm/test.json index 0cad05a..b861b4a 100644 --- a/test cases/frameworks/15 llvm/test.json +++ b/test cases/frameworks/15 llvm/test.json @@ -6,7 +6,7 @@ { "val": "cmake" } ], "link-static": [ - { "val": true }, + { "val": true, "skip_on_jobname": ["opensuse"] }, { "val": false } ] }, diff --git a/test cases/frameworks/16 sdl2/test.json b/test cases/frameworks/16 sdl2/test.json index 8cf8543..664dc84 100644 --- a/test cases/frameworks/16 sdl2/test.json +++ b/test cases/frameworks/16 sdl2/test.json @@ -6,7 +6,7 @@ { "val": "pkg-config" }, { "val": "config-tool" }, { "val": "sdlconfig" }, - { "val": "extraframework" } + { "val": "extraframework", "skip_on_os": ["!macos"] } ] } } diff --git a/test cases/frameworks/17 mpi/test.json b/test cases/frameworks/17 mpi/test.json index b3194ed..2ce6680 100644 --- a/test cases/frameworks/17 mpi/test.json +++ b/test cases/frameworks/17 mpi/test.json @@ -4,12 +4,14 @@ "method": [ { "val": "auto" }, { "val": "pkg-config" }, - { "val": "config-tool" }, + { "val": "config-tool", + "skip_on_jobname": ["fedora"] }, { "val": "system", "compilers": { "c" :"msvc", "cpp": "msvc" } } ] } - } + }, + "skip_on_jobname": ["opensuse"] } diff --git a/test cases/frameworks/25 hdf5/test.json b/test cases/frameworks/25 hdf5/test.json index 0de1f73..678007f 100644 --- a/test cases/frameworks/25 hdf5/test.json +++ b/test cases/frameworks/25 hdf5/test.json @@ -6,5 +6,6 @@ { "val": "config-tool" } ] } - } + }, + "skip_on_jobname": ["fedora", "opensuse"] } diff --git a/test cases/frameworks/26 netcdf/test.json b/test cases/frameworks/26 netcdf/test.json new file mode 100644 index 0000000..d2c95a8 --- /dev/null +++ b/test cases/frameworks/26 netcdf/test.json @@ -0,0 +1,3 @@ +{ + "skip_on_jobname": ["bionic", "fedora", "opensuse", "ubuntu"] +} diff --git a/test cases/frameworks/29 blocks/test.json b/test cases/frameworks/29 blocks/test.json new file mode 100644 index 0000000..b21e77b --- /dev/null +++ b/test cases/frameworks/29 blocks/test.json @@ -0,0 +1,3 @@ +{ + "skip_on_jobname": ["gcc"] +} diff --git a/test cases/frameworks/30 scalapack/test.json b/test cases/frameworks/30 scalapack/test.json new file mode 100644 index 0000000..bda5807 --- /dev/null +++ b/test cases/frameworks/30 scalapack/test.json @@ -0,0 +1,3 @@ +{ + "skip_on_jobname": ["bionic", "fedora", "opensuse"] +} diff --git a/test cases/frameworks/34 gir static lib/test.json b/test cases/frameworks/34 gir static lib/test.json index a99e5a7..96790fb 100644 --- a/test cases/frameworks/34 gir static lib/test.json +++ b/test cases/frameworks/34 gir static lib/test.json @@ -4,5 +4,6 @@ {"type": "expr", "file": "usr/lib/?libgirlib.so"}, {"type": "file", "platform": "cygwin", "file": "usr/lib/libgirlib.dll.a"}, {"type": "file", "file": "usr/share/gir-1.0/Meson-1.0.gir"} - ] + ], + "skip_on_jobname": ["bionic"] } diff --git a/test cases/frameworks/4 qt/test.json b/test cases/frameworks/4 qt/test.json index 4c70060..5144fc0 100644 --- a/test cases/frameworks/4 qt/test.json +++ b/test cases/frameworks/4 qt/test.json @@ -2,8 +2,8 @@ "matrix": { "options": { "method": [ - { "val": "config-tool" }, - { "val": "qmake" }, + { "val": "config-tool", "skip_on_jobname": ["fedora", "opensuse"] }, + { "val": "qmake", "skip_on_jobname": ["fedora", "opensuse"] }, { "val": "pkg-config" } ] } |