[gtk/wip/otte/x11-testsuite: 2/2] CI: Use mutter for the x11-full testsuite run

[Benjamin Otte <otte src gnome org>]

commit 99bd3581de2174472929923d42b521dc8b6b07ae
Author: Benjamin Otte <otte redhat com>
Date:   Thu May 5 23:38:11 2022 +0200

    CI: Use mutter for the x11-full testsuite run
    
    This spawns a mutter WM for the xvfb instance and wraps it in its own
    dbus session.
    
    Also use a larger screen size (1080p) - mostly so we can check the
    testuite runs with differently sized screens, but alspo because that's
    today's default screen size.
    
    This exposes the issue from #4136 in the testsuite.

 .gitlab-ci/fedora.Dockerfile |  1 +
 .gitlab-ci/run-tests.sh      | 16 +++++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index 31bb1697f5..fc80636c89 100644
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -71,6 +71,7 @@ RUN dnf -y install \
     mesa-libEGL-devel \
     mesa-libGLES-devel \
     meson \
+    mutter \
     ninja-build \
     pango-devel \
     pcre-devel \
diff --git a/.gitlab-ci/run-tests.sh b/.gitlab-ci/run-tests.sh
index b135695803..b62b824832 100755
--- a/.gitlab-ci/run-tests.sh
+++ b/.gitlab-ci/run-tests.sh
@@ -13,13 +13,15 @@ export G_SLICE=always-malloc
 
 case "${backend}" in
   x11-full)
-    xvfb-run -a -s "-screen 0 1024x768x24 -noreset" \
-          meson test -C ${builddir} \
-                --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
-                --print-errorlogs \
-                --setup=${backend} \
-                --suite=gtk \
-                --no-suite=gsk-compare-broadway
+    xvfb-run -a -s "-screen 0 1920x1080x24 -noreset" \
+          dbus-run-session \
+              mutter --x11 -- \
+                  meson test -C ${builddir} \
+                        --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
+                        --print-errorlogs \
+                        --setup=${backend} \
+                        --suite=gtk \
+                        --no-suite=gsk-compare-broadway
 
     # Store the exit code for the CI run, but always
     # generate the reports