From 2995f77bd099b2aca072ec1d92cfa28ce79289d1 Mon Sep 17 00:00:00 2001 From: Kenny Levinsen Date: Thu, 15 Apr 2021 22:38:06 +0200 Subject: [PATCH] ci: Test using seatd instead of direct launcher While the commonly used Weston launchers are weston-launch and launcher-logind, the direct backend was used in CI out of convenience, and due to logind being a bit cumbersome to get to work in a CI environment. The new libseat launcher can be used with seatd as well as logind. seatd is easy to start in a CI environment, allowing us to test the libseat launcher codepath instead of the less user relevant direct launcher. This also prepares us for the future intended removal of non-libseat launchers. Signed-off-by: Kenny Levinsen --- .gitlab-ci/virtme-scripts/run-weston-tests.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitlab-ci/virtme-scripts/run-weston-tests.sh b/.gitlab-ci/virtme-scripts/run-weston-tests.sh index bbcebfd7..98ed9a74 100755 --- a/.gitlab-ci/virtme-scripts/run-weston-tests.sh +++ b/.gitlab-ci/virtme-scripts/run-weston-tests.sh @@ -8,6 +8,7 @@ chmod -R 0700 /tmp # set environment variables to run Weston tests export XDG_RUNTIME_DIR=/tmp/tests export WESTON_TEST_SUITE_DRM_DEVICE=card0 +export LIBSEAT_BACKEND=seatd # ninja test depends on meson, and meson itself looks for its modules on folder # $HOME/.local/lib/pythonX.Y/site-packages (the Python version may differ). @@ -15,6 +16,10 @@ export WESTON_TEST_SUITE_DRM_DEVICE=card0 # meson can not find its modules. So we change the HOME env var to fix that. export HOME=/root +# start seatd and wait for its socket to be available before running the test +/usr/local/bin/seatd & +while ! [ -e /run/seatd.sock ]; do sleep 0.1; done + # run the tests and save the exit status ninja test TEST_RES=$?