Compare commits

...

2 Commits

Author SHA1 Message Date
Matthias Clasen
8064b1b52c ci: Set up XDG_RUNTIME_DIR differently 2023-05-13 08:31:35 -04:00
Matthias Clasen
48d5b36b32 ci: Use mutter headless for tests 2023-05-13 08:31:35 -04:00
2 changed files with 7 additions and 2 deletions

View File

@@ -27,6 +27,7 @@ variables:
FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled -Ddemos=false -Dbuild-examples=false -Dbuild-tests=false -Dbuild-testsuite=true"
MESON_TEST_TIMEOUT_MULTIPLIER: 3
FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v46"
XDG_RUNTIME_DIR: "${CI_PROJECT_DIR}/xdg-runtime-dir"
workflow:
rules:
@@ -76,6 +77,8 @@ style-check-diff:
key: "$CI_JOB_NAME"
paths:
- _ccache/
before_script:
- mkdir -m 700 $XDG_RUNTIME_DIR
fedora-x86_64:
extends: .build-fedora-default

View File

@@ -31,9 +31,10 @@ case "${backend}" in
;;
wayland*)
export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
dbus-run-session sh <<EOF
mutter --headless --no-x11 --wayland-display wayland-5 >&mutter.log &
weston --backend=headless-backend.so --socket=wayland-5 --idle-time=0 &
compositor=$!
export WAYLAND_DISPLAY=wayland-5
@@ -50,6 +51,7 @@ case "${backend}" in
exit_code=$?
kill ${compositor}
EOF
;;
broadway)