From a10b0c93eb5d32ab8ba1301c26bde2d98b556a29 Mon Sep 17 00:00:00 2001
From: Jon Turney <jon.turney@dronecode.org.uk>
Date: Wed, 7 Jul 2021 23:56:47 +0100
Subject: Fix skip condition in sdl2 test.json

The build_machine.system() value we should be matching against is
'darwin', not 'macos', so this was expected to skip everywhere.

Unfortunately, fixing this reveals that this test skips in our macos CI
runs also, (I think) because brew doesn't (normally) provide frameworks,
just pkgconfig files.

So, also skip this test there, which means it doesn't run anywhere in
CI currently.
---
 test cases/frameworks/16 sdl2/test.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test cases/frameworks/16 sdl2/test.json b/test cases/frameworks/16 sdl2/test.json
index 664dc8474..1aeaf34c8 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", "skip_on_os": ["!macos"] }
+        { "val": "extraframework", "skip_on_os": ["!darwin"], "skip_on_jobname": ["macos"] }
       ]
     }
   }
-- 
cgit v1.3


From 24135c8c8e8980bebb58b592d38f1a4f1be81c50 Mon Sep 17 00:00:00 2001
From: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu, 10 Jun 2021 20:34:24 +0100
Subject: Set MESON_CI_JOBNAME for all CI jobs

Set MESON_CI_JOBNAME for all CI jobs which run project tests.

(Note that ${{ github.job }} is the literal job.id used in the yaml, not
any name given to the job with job.id.name, and so is the same for all
matrix entries, and thus not suitable for our purposes there).
---
 .github/workflows/cygwin.yml                   |  2 ++
 .github/workflows/macos.yml                    | 12 +++++++++++-
 .github/workflows/msys2.yml                    |  2 ++
 .github/workflows/nonative.yml                 |  3 +++
 .github/workflows/unusedargs_missingreturn.yml |  3 +++
 ci/azure-steps.yml                             |  2 ++
 6 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml
index 39540941c..f86b40429 100644
--- a/.github/workflows/cygwin.yml
+++ b/.github/workflows/cygwin.yml
@@ -24,6 +24,8 @@ jobs:
         include:
           - NAME: gccx64ninja
             ARCH: x86_64
+    env:
+      MESON_CI_JOBNAME: cygwin-${{ matrix.NAME }}
 
     steps:
       # cache should be saved on failure, but the action doesn't support that
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index c7ef7d3bf..df303717a 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -43,8 +43,18 @@ jobs:
   project-tests-appleclang:
     runs-on: macos-latest
     strategy:
+      fail-fast: false
       matrix:
-        unity: ["on", "off"]
+        include:
+        - NAME: macos-clang
+          unity: off
+        - NAME: macos-clang-unity
+          unity: on
+
+    name: ${{ matrix.NAME }}
+    env:
+      MESON_CI_JOBNAME: ${{ matrix.NAME }}
+
     steps:
     - uses: actions/checkout@v2
     # use python3 from homebrew because it is a valid framework, unlike the actions one:
diff --git a/.github/workflows/msys2.yml b/.github/workflows/msys2.yml
index 64a09792b..4a35b0a64 100644
--- a/.github/workflows/msys2.yml
+++ b/.github/workflows/msys2.yml
@@ -40,6 +40,8 @@ jobs:
             MSYS2_CURSES:
             COMPILER: clang
             TOOLCHAIN: clang
+    env:
+      MESON_CI_JOBNAME: msys2-${{ matrix.NAME }}
 
     defaults:
       run:
diff --git a/.github/workflows/nonative.yml b/.github/workflows/nonative.yml
index c4bad9531..d6bdfa6de 100644
--- a/.github/workflows/nonative.yml
+++ b/.github/workflows/nonative.yml
@@ -22,6 +22,9 @@ jobs:
   cross-only-armhf:
     runs-on: ubuntu-latest
     container: mesonbuild/eoan:latest
+    env:
+      MESON_CI_JOBNAME: ubuntu-${{ github.job }}
+
     steps:
     - run: |
         apt-get -y purge clang gcc gdc
diff --git a/.github/workflows/unusedargs_missingreturn.yml b/.github/workflows/unusedargs_missingreturn.yml
index 8e6e42de1..7b4379bf3 100644
--- a/.github/workflows/unusedargs_missingreturn.yml
+++ b/.github/workflows/unusedargs_missingreturn.yml
@@ -47,6 +47,8 @@ jobs:
         sudo apt install -yq --no-install-recommends g++ gfortran ninja-build gobjc gobjc++
         python -m pip install coverage codecov
     - run: ./tools/run_with_cov.py run_project_tests.py --only cmake common fortran platform-linux "objective c" "objective c++"
+      env:
+        MESON_CI_JOBNAME: linux-ubuntu-gcc-werror
     - name: Upload coverage report
       run: ./ci/upload_cov.sh "UnusedMissingReturn"
 
@@ -65,6 +67,7 @@ jobs:
         CC: gcc
         CXX: g++
         FC: gfortran
+        MESON_CI_JOBNAME: msys2-gcc-werror
 
     - name: Upload coverage report
       run: ./ci/upload_cov.sh "UnusedMissingReturn Windows"
diff --git a/ci/azure-steps.yml b/ci/azure-steps.yml
index 233bbfa36..8aba2242d 100644
--- a/ci/azure-steps.yml
+++ b/ci/azure-steps.yml
@@ -3,6 +3,8 @@ steps:
   inputs:
     targetType: 'filePath'
     filePath: .\ci\run.ps1
+  env:
+    MESON_CI_JOBNAME: azure-$(System.JobName)
 
 - task: PublishTestResults@2
   inputs:
-- 
cgit v1.3


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: 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"]
+}
-- 
cgit v1.3


From 3c81ff8f0017ac56ed35b1c7f999c56a7e88bd89 Mon Sep 17 00:00:00 2001
From: Jon Turney <jon.turney@dronecode.org.uk>
Date: Wed, 7 Jul 2021 21:18:57 +0100
Subject: Make it an error if MESON_CI_JOBNAME isn't set under CI

Also check skip is as expected for CI all runs, not just those that set
MESON_CI_JOBNAME.
---
 run_project_tests.py | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/run_project_tests.py b/run_project_tests.py
index 57a81881f..648ec47b5 100755
--- a/run_project_tests.py
+++ b/run_project_tests.py
@@ -962,12 +962,6 @@ def skip_dont_care(t: TestDef) -> bool:
     if not t.category.endswith('frameworks'):
         return True
 
-    # For the moment, all skips in jobs which don't set MESON_CI_JOBNAME are
-    # treated as expected.  In the future, we should make it mandatory to set
-    # MESON_CI_JOBNAME for all CI jobs.
-    if ci_jobname is None:
-        return True
-
     return False
 
 def skip_csharp(backend: Backend) -> bool:
@@ -1490,6 +1484,9 @@ def clear_transitive_files() -> None:
             mesonlib.windows_proof_rm(str(d))
 
 if __name__ == '__main__':
+    if under_ci and not ci_jobname:
+        raise SystemExit('Running under CI but MESON_CI_JOBNAME is not set')
+
     setup_vsenv()
 
     try:
-- 
cgit v1.3