From a503e86615faa60a86f8cfb672520afe157658d7 Mon Sep 17 00:00:00 2001 From: Faith Ekstrand Date: Tue, 8 Jul 2025 13:45:39 -0400 Subject: [PATCH] ci: Add a weston.ini This lets us avoid a few command line options. Also, we're to need it for setting the XWayland path, which isn't available as a command line option. Reviewed-by: Eric Engestrom Reviewed-by: Valentine Burley Part-of: --- .gitlab-ci/common/init-stage2.sh | 3 +-- .gitlab-ci/common/weston.ini | 4 ++++ .gitlab-ci/piglit/piglit-traces.sh | 3 +-- 3 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 .gitlab-ci/common/weston.ini diff --git a/.gitlab-ci/common/init-stage2.sh b/.gitlab-ci/common/init-stage2.sh index e1bb4f860cd..6f81bc4fd17 100755 --- a/.gitlab-ci/common/init-stage2.sh +++ b/.gitlab-ci/common/init-stage2.sh @@ -198,8 +198,7 @@ if [ -n "$HWCI_START_WESTON" ]; then export DISPLAY=:0 mkdir -p /tmp/.X11-unix - env \ - weston -Bheadless-backend.so --use-gl -Swayland-0 --xwayland --idle-time=0 & + env weston --config="/install/common/weston.ini" -Swayland-0 --use-gl & BACKGROUND_PIDS="$! $BACKGROUND_PIDS" while [ ! -S "$WESTON_X11_SOCK" ]; do sleep 1; done diff --git a/.gitlab-ci/common/weston.ini b/.gitlab-ci/common/weston.ini new file mode 100644 index 00000000000..338faf2180f --- /dev/null +++ b/.gitlab-ci/common/weston.ini @@ -0,0 +1,4 @@ +[core] +backend=headless-backend.so +xwayland=true +idle-time=0 diff --git a/.gitlab-ci/piglit/piglit-traces.sh b/.gitlab-ci/piglit/piglit-traces.sh index dba58e2468b..69e8679b153 100755 --- a/.gitlab-ci/piglit/piglit-traces.sh +++ b/.gitlab-ci/piglit/piglit-traces.sh @@ -97,8 +97,7 @@ else export DISPLAY=:0 mkdir -p /tmp/.X11-unix - env \ - weston -Bheadless-backend.so --use-gl -Swayland-0 --xwayland --idle-time=0 & + env weston --config="/install/common/weston.ini" -Swayland-0 --use-gl & while [ ! -S "$WESTON_X11_SOCK" ]; do sleep 1; done }