From 504ca9c0c8103bc8b0c2bd2819fec4270ffb6c06 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Thu, 22 Aug 2024 05:33:53 +0200
Subject: [PATCH] CI: run tests in a single dbus session

Instead of every test spawning their own dbus, make the tests share the
same server, just like they share their own compositor.

This should speed up things a bit and avoid weird interactions when
multiple dbus processes exist.
---
 .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 0996e07bdd..8932d23473 100755
--- a/.gitlab-ci/run-tests.sh
+++ b/.gitlab-ci/run-tests.sh
@@ -15,7 +15,8 @@ export LSAN_OPTIONS=suppressions=$srcdir/lsan.supp:print_suppressions=0:detect_l
 
 case "${setup}" in
   x11*)
-    xvfb-run -a -s "-screen 0 1024x768x24 -noreset" \
+    dbus-run-session -- \
+       xvfb-run -a -s "-screen 0 1024x768x24 -noreset" \
           meson test -C ${builddir} \
                 --quiet \
                 --timeout-multiplier "${multiplier}" \
@@ -41,7 +42,8 @@ case "${setup}" in
     compositor=$!
     export WAYLAND_DISPLAY=wayland-5
 
-    meson test -C ${builddir} \
+    dbus-run-session -- \
+          meson test -C ${builddir} \
                 --quiet \
                 --timeout-multiplier "${multiplier}" \
                 --num-processes "${n_processes}" \
@@ -65,7 +67,8 @@ case "${setup}" in
     server=$!
     export BROADWAY_DISPLAY=:5
 
-    meson test -C ${builddir} \
+    dbus-run-session -- \
+          meson test -C ${builddir} \
                 --quiet \
                 --timeout-multiplier "${multiplier}" \
                 --num-processes "${n_processes}" \