From 538b347218bbfdcd303ace7dc47f2d31665264b0 Mon Sep 17 00:00:00 2001
From: Jon Turney <jon.turney@dronecode.org.uk>
Date: Wed, 7 Jul 2021 23:13:45 +0100
Subject: [PATCH] Add expected skip annotations for non-linux CI runs to
 framework tests

---
 test cases/frameworks/1 boost/test.json             | 3 ++-
 test cases/frameworks/10 gtk-doc/test.json          | 3 ++-
 test cases/frameworks/11 gir subproject/test.json   | 3 ++-
 test cases/frameworks/12 multiple gir/test.json     | 3 ++-
 test cases/frameworks/13 yelp/test.json             | 3 ++-
 test cases/frameworks/14 doxygen/test.json          | 3 ++-
 test cases/frameworks/15 llvm/test.json             | 7 ++++---
 test cases/frameworks/16 sdl2/test.json             | 3 ++-
 test cases/frameworks/17 mpi/test.json              | 2 +-
 test cases/frameworks/18 vulkan/test.json           | 3 +++
 test cases/frameworks/19 pcap/test.json             | 3 +++
 test cases/frameworks/2 gtest/test.json             | 3 +++
 test cases/frameworks/20 cups/test.json             | 3 +++
 test cases/frameworks/21 libwmf/test.json           | 3 +++
 test cases/frameworks/22 gir link order/test.json   | 3 +++
 test cases/frameworks/23 hotdoc/test.json           | 3 ++-
 test cases/frameworks/24 libgcrypt/test.json        | 3 +++
 test cases/frameworks/25 hdf5/test.json             | 4 ++--
 test cases/frameworks/26 netcdf/test.json           | 2 +-
 test cases/frameworks/27 gpgme/test.json            | 3 +++
 test cases/frameworks/28 gir link order 2/test.json | 3 +++
 test cases/frameworks/29 blocks/test.json           | 2 +-
 test cases/frameworks/3 gmock/test.json             | 3 +++
 test cases/frameworks/30 scalapack/test.json        | 2 +-
 test cases/frameworks/31 curses/test.json           | 7 ++++---
 test cases/frameworks/34 gir static lib/test.json   | 2 +-
 test cases/frameworks/4 qt/test.json                | 3 ++-
 test cases/frameworks/5 protocol buffers/test.json  | 3 +++
 test cases/frameworks/6 gettext/test.json           | 3 ++-
 test cases/frameworks/7 gnome/test.json             | 3 ++-
 test cases/frameworks/8 flex/test.json              | 3 +++
 31 files changed, 73 insertions(+), 24 deletions(-)
 create mode 100644 test cases/frameworks/18 vulkan/test.json
 create mode 100644 test cases/frameworks/19 pcap/test.json
 create mode 100644 test cases/frameworks/2 gtest/test.json
 create mode 100644 test cases/frameworks/20 cups/test.json
 create mode 100644 test cases/frameworks/21 libwmf/test.json
 create mode 100644 test cases/frameworks/22 gir link order/test.json
 create mode 100644 test cases/frameworks/24 libgcrypt/test.json
 create mode 100644 test cases/frameworks/27 gpgme/test.json
 create mode 100644 test cases/frameworks/28 gir link order 2/test.json
 create mode 100644 test cases/frameworks/3 gmock/test.json
 create mode 100644 test cases/frameworks/5 protocol buffers/test.json
 create mode 100644 test cases/frameworks/8 flex/test.json

diff --git a/test cases/frameworks/1 boost/test.json b/test cases/frameworks/1 boost/test.json
index 3145c80d2..2c5b857e9 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 03ad05958..edade393c 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 e94152efa..7fbce30e7 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 4e3624c19..4ccecc83f 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 070fb321b..ffe75cb0f 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 f4a6f8a76..c8c4fb0f8 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 b861b4a64..6e5667556 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 1aeaf34c8..57a3f21b6 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 2ce66806a..115f6f6f5 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 000000000..6ace9de70
--- /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 000000000..8ee026a60
--- /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 000000000..6ace9de70
--- /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 000000000..8ee026a60
--- /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 000000000..6ace9de70
--- /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 000000000..a9d74fb8a
--- /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 8b7bd7ecc..e13971ee8 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 000000000..3b4220211
--- /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 678007f25..dd073ece9 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 d2c95a8bb..83c629167 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 000000000..6ace9de70
--- /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 000000000..a9d74fb8a
--- /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 b21e77b8e..34a8c415d 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 000000000..6ace9de70
--- /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 bda580772..0c4057316 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 39956952f..03ed3a201 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 96790fbe2..8d7f707d7 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 5144fc0d4..fbeead54b 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 000000000..6ace9de70
--- /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 1ed2dbf79..55a475a67 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 badf410f0..d243cff1d 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 000000000..613cfe59f
--- /dev/null
+++ b/test cases/frameworks/8 flex/test.json	
@@ -0,0 +1,3 @@
+{
+  "skip_on_jobname": ["azure", "cygwin"]
+}