From 350110ad9d8fd5c71ef2cae2fdbf730a9f4dec25 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 16 May 2020 10:11:52 -0400
Subject: [PATCH 1/2] testsuite: Add a gsk-compare-broadway suite

We have a Broadway renderer, might as well spell
that out in the tests, and make the suite exclude the
3d tests it can't handle.
---
 testsuite/gsk/meson.build | 1 +
 1 file changed, 1 insertion(+)

diff --git a/testsuite/gsk/meson.build b/testsuite/gsk/meson.build
index 0eeff8d3e8..c72d6a2951 100644
--- a/testsuite/gsk/meson.build
+++ b/testsuite/gsk/meson.build
@@ -80,6 +80,7 @@ informative_render_tests = [
 renderers = [
   # name      exclude term
   [ 'opengl', ''    ],
+  [ 'broadway',  '-3d' ],
   [ 'cairo',  '-3d' ],
 ]
 

From 13f85839345b378594c54ede0e5da56f0ef820a4 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 16 May 2020 10:12:47 -0400
Subject: [PATCH 2/2] ci: Don't run opengl renderer tests on Broadway

The test setup mechanism in meson is not flexible
enough to let us run different suites depending
on setup, so just pass in explicitly which suites
we want to skip, depending on the backend.
---
 .gitlab-ci/run-tests.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci/run-tests.sh b/.gitlab-ci/run-tests.sh
index b8c61cecb7..455aa1c13b 100755
--- a/.gitlab-ci/run-tests.sh
+++ b/.gitlab-ci/run-tests.sh
@@ -14,7 +14,8 @@ case "${backend}" in
                 --print-errorlogs \
                 --setup=${backend} \
                 --suite=gtk \
-                --no-suite=gtk:a11y
+                --no-suite=gtk:a11y \
+                --no-suite=gsk-compare-broadway
 
     # Store the exit code for the CI run, but always
     # generate the reports
@@ -32,7 +33,8 @@ case "${backend}" in
                 --print-errorlogs \
                 --setup=${backend} \
                 --suite=gtk \
-                --no-suite=gtk:a11y
+                --no-suite=gtk:a11y \
+                --no-suite=gsk-compare-broadway
 
     exit_code=$?
     kill ${compositor}
@@ -49,7 +51,8 @@ case "${backend}" in
                 --print-errorlogs \
                 --setup=${backend} \
                 --suite=gtk \
-                --no-suite=gtk:a11y
+                --no-suite=gtk:a11y \
+                --no-suite=gsk-compare-opengl
 
     # don't let Broadway failures fail the run, for now
     exit_code=0