summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2022-05-05 23:38:11 +0200
committerBenjamin Otte <otte@redhat.com>2022-05-21 21:12:39 +0200
commit68161f022e1a333f327ac173a79a94966fea9e8b (patch)
treeb441a91881508da27f11257d24d7205d7917a8a3
parent0e95145a23d9e37931995f81c370efdb4a3eeced (diff)
downloadgtk+-wip/otte/x11-testsuite.tar.gz
CI: Use mutter for the x11-full testsuite runwip/otte/x11-testsuite
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.
-rwxr-xr-x.gitlab-ci/run-tests.sh16
1 files changed, 9 insertions, 7 deletions
diff --git a/.gitlab-ci/run-tests.sh b/.gitlab-ci/run-tests.sh
index 61559ebb7e..d0767fc7a2 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
x11full)
- 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