diff options
author | Jon Turney <jon.turney@dronecode.org.uk> | 2021-07-07 23:13:45 +0100 |
---|---|---|
committer | Jon Turney <jon.turney@dronecode.org.uk> | 2021-07-13 15:25:42 +0100 |
commit | 538b347218bbfdcd303ace7dc47f2d31665264b0 (patch) | |
tree | 16553569081d51acba52df139732add67effc3b2 | |
parent | 24135c8c8e8980bebb58b592d38f1a4f1be81c50 (diff) | |
download | meson-538b347218bbfdcd303ace7dc47f2d31665264b0.zip meson-538b347218bbfdcd303ace7dc47f2d31665264b0.tar.gz meson-538b347218bbfdcd303ace7dc47f2d31665264b0.tar.bz2 |
Add expected skip annotations for non-linux CI runs to framework tests
31 files changed, 73 insertions, 24 deletions
diff --git a/test cases/frameworks/1 boost/test.json b/test cases/frameworks/1 boost/test.json index 3145c80..2c5b857 100644 --- a/test cases/frameworks/1 boost/test.json +++ b/test cases/frameworks/1 boost/test.json @@ -17,5 +17,6 @@ { "static": "false", "b_vscrt": "mt" }, { "static": "false", "b_vscrt": "mtd" } ] - } + }, + "skip_on_jobname": ["azure", "msys2"] } diff --git a/test cases/frameworks/10 gtk-doc/test.json b/test cases/frameworks/10 gtk-doc/test.json index 03ad059..edade39 100644 --- a/test cases/frameworks/10 gtk-doc/test.json +++ b/test cases/frameworks/10 gtk-doc/test.json @@ -57,5 +57,6 @@ {"type": "file", "file": "usr/share/gtk-doc/html/foobar3/style.css"}, {"type": "file", "file": "usr/share/gtk-doc/html/foobar3/up.png"}, {"type": "file", "file": "usr/share/gtk-doc/html/foobar3/up-insensitive.png"} - ] + ], + "skip_on_jobname": ["azure", "macos", "msys2"] } diff --git a/test cases/frameworks/11 gir subproject/test.json b/test cases/frameworks/11 gir subproject/test.json index e94152e..7fbce30 100644 --- a/test cases/frameworks/11 gir subproject/test.json +++ b/test cases/frameworks/11 gir subproject/test.json @@ -8,5 +8,6 @@ {"type": "file", "platform": "cygwin", "file": "usr/lib/libgirlib.dll.a"}, {"type": "expr", "file": "usr/lib/?libgirlib.so"}, {"type": "file", "platform": "cygwin", "file": "usr/lib/libgirsubproject.dll.a"} - ] + ], + "skip_on_jobname": ["azure", "cygwin", "macos", "msys2"] } diff --git a/test cases/frameworks/12 multiple gir/test.json b/test cases/frameworks/12 multiple gir/test.json index 4e3624c..4ccecc8 100644 --- a/test cases/frameworks/12 multiple gir/test.json +++ b/test cases/frameworks/12 multiple gir/test.json @@ -8,5 +8,6 @@ {"type": "file", "platform": "cygwin", "file": "usr/lib/libgirsubproject.dll.a"}, {"type": "file", "file": "usr/share/gir-1.0/Meson-1.0.gir"}, {"type": "file", "file": "usr/share/gir-1.0/MesonSub-1.0.gir"} - ] + ], + "skip_on_jobname": ["azure", "macos", "msys2"] } diff --git a/test cases/frameworks/13 yelp/test.json b/test cases/frameworks/13 yelp/test.json index 070fb32..ffe75cb 100644 --- a/test cases/frameworks/13 yelp/test.json +++ b/test cases/frameworks/13 yelp/test.json @@ -18,5 +18,6 @@ {"type": "file", "file": "usr/share/help/es/meson-linguas/index.page"}, {"type": "file", "file": "usr/share/help/de/meson-linguas/index.page"}, {"type": "file", "file": "usr/share/help/de/meson-linguas/media/test.txt"} - ] + ], + "skip_on_jobname": ["azure", "cygwin", "macos", "msys2"] } diff --git a/test cases/frameworks/14 doxygen/test.json b/test cases/frameworks/14 doxygen/test.json index f4a6f8a..c8c4fb0 100644 --- a/test cases/frameworks/14 doxygen/test.json +++ b/test cases/frameworks/14 doxygen/test.json @@ -1,5 +1,6 @@ { "installed": [ {"type": "dir", "file": "usr/share/doc/spede/html"} - ] + ], + "skip_on_jobname": ["azure", "cygwin", "macos", "msys2"] } diff --git a/test cases/frameworks/15 llvm/test.json b/test cases/frameworks/15 llvm/test.json index b861b4a..6e56675 100644 --- a/test cases/frameworks/15 llvm/test.json +++ b/test cases/frameworks/15 llvm/test.json @@ -2,8 +2,8 @@ "matrix": { "options": { "method": [ - { "val": "config-tool" }, - { "val": "cmake" } + { "val": "config-tool", "skip_on_jobname": ["msys2-gcc"]}, + { "val": "cmake", "skip_on_jobname": ["msys2"] } ], "link-static": [ { "val": true, "skip_on_jobname": ["opensuse"] }, @@ -13,5 +13,6 @@ "exclude": [ { "method": "cmake", "link-static": false } ] - } + }, + "skip_on_jobname": ["azure", "cygwin"] } diff --git a/test cases/frameworks/16 sdl2/test.json b/test cases/frameworks/16 sdl2/test.json index 1aeaf34..57a3f21 100644 --- a/test cases/frameworks/16 sdl2/test.json +++ b/test cases/frameworks/16 sdl2/test.json @@ -9,5 +9,6 @@ { "val": "extraframework", "skip_on_os": ["!darwin"], "skip_on_jobname": ["macos"] } ] } - } + }, + "skip_on_jobname": ["azure", "cygwin", "msys2"] } diff --git a/test cases/frameworks/17 mpi/test.json b/test cases/frameworks/17 mpi/test.json index 2ce6680..115f6f6 100644 --- a/test cases/frameworks/17 mpi/test.json +++ b/test cases/frameworks/17 mpi/test.json @@ -13,5 +13,5 @@ ] } }, - "skip_on_jobname": ["opensuse"] + "skip_on_jobname": ["azure", "cygwin", "msys2", "opensuse"] } diff --git a/test cases/frameworks/18 vulkan/test.json b/test cases/frameworks/18 vulkan/test.json new file mode 100644 index 0000000..6ace9de --- /dev/null +++ b/test cases/frameworks/18 vulkan/test.json @@ -0,0 +1,3 @@ +{ + "skip_on_jobname": ["azure", "cygwin", "macos", "msys2"] +} diff --git a/test cases/frameworks/19 pcap/test.json b/test cases/frameworks/19 pcap/test.json new file mode 100644 index 0000000..8ee026a --- /dev/null +++ b/test cases/frameworks/19 pcap/test.json @@ -0,0 +1,3 @@ +{ + "skip_on_jobname": ["azure", "cygwin", "msys2"] +} diff --git a/test cases/frameworks/2 gtest/test.json b/test cases/frameworks/2 gtest/test.json new file mode 100644 index 0000000..6ace9de --- /dev/null +++ b/test cases/frameworks/2 gtest/test.json @@ -0,0 +1,3 @@ +{ + "skip_on_jobname": ["azure", "cygwin", "macos", "msys2"] +} diff --git a/test cases/frameworks/20 cups/test.json b/test cases/frameworks/20 cups/test.json new file mode 100644 index 0000000..8ee026a --- /dev/null +++ b/test cases/frameworks/20 cups/test.json @@ -0,0 +1,3 @@ +{ + "skip_on_jobname": ["azure", "cygwin", "msys2"] +} diff --git a/test cases/frameworks/21 libwmf/test.json b/test cases/frameworks/21 libwmf/test.json new file mode 100644 index 0000000..6ace9de --- /dev/null +++ b/test cases/frameworks/21 libwmf/test.json @@ -0,0 +1,3 @@ +{ + "skip_on_jobname": ["azure", "cygwin", "macos", "msys2"] +} diff --git a/test cases/frameworks/22 gir link order/test.json b/test cases/frameworks/22 gir link order/test.json new file mode 100644 index 0000000..a9d74fb --- /dev/null +++ b/test cases/frameworks/22 gir link order/test.json @@ -0,0 +1,3 @@ +{ + "skip_on_jobname": ["azure", "macos", "msys2"] +} diff --git a/test cases/frameworks/23 hotdoc/test.json b/test cases/frameworks/23 hotdoc/test.json index 8b7bd7e..e13971e 100644 --- a/test cases/frameworks/23 hotdoc/test.json +++ b/test cases/frameworks/23 hotdoc/test.json @@ -4,5 +4,6 @@ ], "tools": { "hotdoc": ">=0.1.0" - } + }, + "skip_on_jobname": ["msys2"] } diff --git a/test cases/frameworks/24 libgcrypt/test.json b/test cases/frameworks/24 libgcrypt/test.json new file mode 100644 index 0000000..3b42202 --- /dev/null +++ b/test cases/frameworks/24 libgcrypt/test.json @@ -0,0 +1,3 @@ +{ + "skip_on_jobname": ["azure"] +} diff --git a/test cases/frameworks/25 hdf5/test.json b/test cases/frameworks/25 hdf5/test.json index 678007f..dd073ec 100644 --- a/test cases/frameworks/25 hdf5/test.json +++ b/test cases/frameworks/25 hdf5/test.json @@ -2,10 +2,10 @@ "matrix": { "options": { "method": [ - { "val": "pkg-config" }, + { "val": "pkg-config", "skip_on_jobname": ["macos"] }, { "val": "config-tool" } ] } }, - "skip_on_jobname": ["fedora", "opensuse"] + "skip_on_jobname": ["azure", "cygwin", "fedora", "msys2", "opensuse"] } diff --git a/test cases/frameworks/26 netcdf/test.json b/test cases/frameworks/26 netcdf/test.json index d2c95a8..83c6291 100644 --- a/test cases/frameworks/26 netcdf/test.json +++ b/test cases/frameworks/26 netcdf/test.json @@ -1,3 +1,3 @@ { - "skip_on_jobname": ["bionic", "fedora", "opensuse", "ubuntu"] + "skip_on_jobname": ["azure", "bionic", "cygwin", "fedora", "macos", "msys2", "opensuse", "ubuntu"] } diff --git a/test cases/frameworks/27 gpgme/test.json b/test cases/frameworks/27 gpgme/test.json new file mode 100644 index 0000000..6ace9de --- /dev/null +++ b/test cases/frameworks/27 gpgme/test.json @@ -0,0 +1,3 @@ +{ + "skip_on_jobname": ["azure", "cygwin", "macos", "msys2"] +} diff --git a/test cases/frameworks/28 gir link order 2/test.json b/test cases/frameworks/28 gir link order 2/test.json new file mode 100644 index 0000000..a9d74fb --- /dev/null +++ b/test cases/frameworks/28 gir link order 2/test.json @@ -0,0 +1,3 @@ +{ + "skip_on_jobname": ["azure", "macos", "msys2"] +} diff --git a/test cases/frameworks/29 blocks/test.json b/test cases/frameworks/29 blocks/test.json index b21e77b..34a8c41 100644 --- a/test cases/frameworks/29 blocks/test.json +++ b/test cases/frameworks/29 blocks/test.json @@ -1,3 +1,3 @@ { - "skip_on_jobname": ["gcc"] + "skip_on_jobname": ["azure", "gcc", "msys2"] } diff --git a/test cases/frameworks/3 gmock/test.json b/test cases/frameworks/3 gmock/test.json new file mode 100644 index 0000000..6ace9de --- /dev/null +++ b/test cases/frameworks/3 gmock/test.json @@ -0,0 +1,3 @@ +{ + "skip_on_jobname": ["azure", "cygwin", "macos", "msys2"] +} diff --git a/test cases/frameworks/30 scalapack/test.json b/test cases/frameworks/30 scalapack/test.json index bda5807..0c40573 100644 --- a/test cases/frameworks/30 scalapack/test.json +++ b/test cases/frameworks/30 scalapack/test.json @@ -1,3 +1,3 @@ { - "skip_on_jobname": ["bionic", "fedora", "opensuse"] + "skip_on_jobname": ["azure", "bionic", "cygwin", "fedora", "msys2", "opensuse"] } diff --git a/test cases/frameworks/31 curses/test.json b/test cases/frameworks/31 curses/test.json index 3995695..03ed3a2 100644 --- a/test cases/frameworks/31 curses/test.json +++ b/test cases/frameworks/31 curses/test.json @@ -3,9 +3,10 @@ "options": { "method": [ { "val": "pkg-config" }, - { "val": "config-tool" }, - { "val": "system" } + { "val": "config-tool", "skip_on_jobname": ["msys2"] }, + { "val": "system", "skip_on_os": ["windows"] } ] } - } + }, + "skip_on_jobname": ["azure", "cygwin"] } diff --git a/test cases/frameworks/34 gir static lib/test.json b/test cases/frameworks/34 gir static lib/test.json index 96790fb..8d7f707 100644 --- a/test cases/frameworks/34 gir static lib/test.json +++ b/test cases/frameworks/34 gir static lib/test.json @@ -5,5 +5,5 @@ {"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"] + "skip_on_jobname": ["azure", "bionic", "cygwin", "macos", "msys2"] } diff --git a/test cases/frameworks/4 qt/test.json b/test cases/frameworks/4 qt/test.json index 5144fc0..fbeead5 100644 --- a/test cases/frameworks/4 qt/test.json +++ b/test cases/frameworks/4 qt/test.json @@ -7,5 +7,6 @@ { "val": "pkg-config" } ] } - } + }, + "skip_on_jobname": ["cygwin", "msys2", "azure"] } diff --git a/test cases/frameworks/5 protocol buffers/test.json b/test cases/frameworks/5 protocol buffers/test.json new file mode 100644 index 0000000..6ace9de --- /dev/null +++ b/test cases/frameworks/5 protocol buffers/test.json @@ -0,0 +1,3 @@ +{ + "skip_on_jobname": ["azure", "cygwin", "macos", "msys2"] +} diff --git a/test cases/frameworks/6 gettext/test.json b/test cases/frameworks/6 gettext/test.json index 1ed2dbf..55a475a 100644 --- a/test cases/frameworks/6 gettext/test.json +++ b/test cases/frameworks/6 gettext/test.json @@ -10,5 +10,6 @@ {"type": "file", "file": "usr/share/applications/test2.desktop"}, {"type": "file", "file": "usr/share/applications/test3.desktop"}, {"type": "file", "file": "usr/share/applications/test4.desktop"} - ] + ], + "skip_on_jobname": ["azure", "cygwin"] } diff --git a/test cases/frameworks/7 gnome/test.json b/test cases/frameworks/7 gnome/test.json index badf410..d243cff 100644 --- a/test cases/frameworks/7 gnome/test.json +++ b/test cases/frameworks/7 gnome/test.json @@ -28,5 +28,6 @@ {"type": "file", "file": "usr/include/enums6.h"}, {"type": "file", "file": "usr/include/simple-resources.h"}, {"type": "file", "file": "usr/include/generated-gdbus.h"} - ] + ], + "skip_on_jobname": ["azure", "cygwin", "macos", "msys2"] } diff --git a/test cases/frameworks/8 flex/test.json b/test cases/frameworks/8 flex/test.json new file mode 100644 index 0000000..613cfe5 --- /dev/null +++ b/test cases/frameworks/8 flex/test.json @@ -0,0 +1,3 @@ +{ + "skip_on_jobname": ["azure", "cygwin"] +} |