From 609864a66ddc6af559fadadd76a266d64ae9991e Mon Sep 17 00:00:00 2001
From: Jon Turney <jon.turney@dronecode.org.uk>
Date: Mon, 21 Jun 2021 14:06:45 +0100
Subject: 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)
---
 .github/workflows/os_comp.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to '.github')

diff --git a/.github/workflows/os_comp.yml b/.github/workflows/os_comp.yml
index 6531e2b55..dc5f36846 100644
--- a/.github/workflows/os_comp.yml
+++ b/.github/workflows/os_comp.yml
@@ -1,4 +1,4 @@
-name: OS Comp Tests
+name: linux
 
 on:
   push:
@@ -34,6 +34,9 @@ jobs:
           - { name: OpenSUSE,         id: opensuse }
           - { name: Ubuntu Bionic,    id: bionic   }
     container: mesonbuild/${{ matrix.cfg.id }}:latest
+    env:
+      MESON_CI_JOBNAME: linux-${{ matrix.cfg.id }}-gcc
+
     steps:
     - uses: actions/checkout@v2
     - name: Run tests
@@ -77,6 +80,9 @@ jobs:
             CC: 'gcc'
             CXX: 'g++'
 
+    env:
+      MESON_CI_JOBNAME: linux-${{ github.job }}-${{ matrix.cfg.CC }}
+
     container:
       image: mesonbuild/ubuntu-rolling
       env:
-- 
cgit v1.2.3