From c679ba9ebfdbf32466c088d2ac3bdbe94d22b403 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sun, 19 Nov 2023 12:45:02 -0500
Subject: [PATCH] wip: ci: rework the test runs

---
 .gitlab-ci.yml          | 10 ++++------
 .gitlab-ci/run-tests.sh |  6 +++---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8a416883fc..e9a05416eb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -103,8 +103,8 @@ fedora-x86_64:
             ${FEATURE_FLAGS}
             _build
     - meson compile -C _build
-    - .gitlab-ci/run-tests.sh _build wayland_gl gtk
-    - .gitlab-ci/run-tests.sh _build wayland_gles2 gtk
+    - .gitlab-ci/run-tests.sh _build wayland_gl gtk:gdk,gtk:gsk
+    - .gitlab-ci/run-tests.sh _build wayland_gles2 gtk:gdk,gtk:gsk
 
 release-build:
   extends: .build-fedora-default
@@ -129,8 +129,8 @@ release-build:
     - meson install -C _build
     - PKG_CONFIG_PATH=${CI_PROJECT_DIR}/_install/lib64/pkgconfig:${CI_PROJECT_DIR}/_install/share/pkgconfig meson setup _build_hello examples/hello
     - LD_LIBRARY_PATH=${CI_PROJECT_DIR}/_install/lib64 meson compile -C _build_hello
-    - .gitlab-ci/run-tests.sh _build wayland gtk
-    - .gitlab-ci/run-tests.sh _build x11 gtk
+    - .gitlab-ci/run-tests.sh _build wayland gtk:gtk
+    - .gitlab-ci/run-tests.sh _build x11 gtk:gtk
 
 fedora-clang:
   extends: .build-fedora-default
@@ -425,8 +425,6 @@ asan-build:
             _build
     - ninja -C _build
     - .gitlab-ci/run-tests.sh _build wayland gtk
-    - .gitlab-ci/run-tests.sh _build wayland_gles2 gtk
-    - .gitlab-ci/run-tests.sh _build x11 gtk
   artifacts:
     when: always
     paths:
diff --git a/.gitlab-ci/run-tests.sh b/.gitlab-ci/run-tests.sh
index dd486bc972..efa03e721e 100755
--- a/.gitlab-ci/run-tests.sh
+++ b/.gitlab-ci/run-tests.sh
@@ -21,7 +21,7 @@ case "${setup}" in
                 --timeout-multiplier "${multiplier}" \
                 --print-errorlogs \
                 --setup=${setup} \
-                --suite=${suite} \
+                --suite=${suite//,/'--suite='} \
                 --no-suite=failing \
                 --no-suite=${setup}_failing \
                 --no-suite=flaky \
@@ -45,7 +45,7 @@ case "${setup}" in
                 --timeout-multiplier "${multiplier}" \
                 --print-errorlogs \
                 --setup=${setup} \
-                --suite=${suite} \
+                --suite=${suite//,/'--suite='} \
                 --no-suite=failing \
                 --no-suite=${setup}_failing \
                 --no-suite=flaky \
@@ -68,7 +68,7 @@ case "${setup}" in
                 --timeout-multiplier "${multiplier}" \
                 --print-errorlogs \
                 --setup=${setup} \
-                --suite=${suite} \
+                --suite=${suite//,/'--suite='} \
                 --no-suite=failing \
                 --no-suite=${setup}_failing \
                 --no-suite=flaky \