From cb0315bcd7b524acab611732caaf7d2e3bb0a0d4 Mon Sep 17 00:00:00 2001
From: Valentine Burley <valentine.burley@collabora.com>
Date: Tue, 5 Aug 2025 10:04:40 +0200
Subject: [PATCH] softpipe/ci: Use Weston's Xwayland instead of Xvfb

Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36567>
---
 src/gallium/drivers/softpipe/ci/gitlab-ci.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/softpipe/ci/gitlab-ci.yml b/src/gallium/drivers/softpipe/ci/gitlab-ci.yml
index 8a43ce329be..90d01b95cc4 100644
--- a/src/gallium/drivers/softpipe/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/softpipe/ci/gitlab-ci.yml
@@ -4,7 +4,6 @@ include:
 softpipe:
   variables:
     DEQP_SUITE: softpipe
-    XVFB_SCRIPT: "install/deqp-runner.sh"
     DEQP_FRACTION: 4
   timeout: 15m
   extends:
@@ -14,7 +13,10 @@ softpipe:
     . "$SCRIPTS_DIR"/setup-test-env.sh
     export LD_LIBRARY_PATH=$CI_PROJECT_DIR/install/lib
     export LIBGL_DRIVERS_PATH=$CI_PROJECT_DIR/install/lib/dri
-    xvfb-run -e results/xvfb.log --server-args='-noreset' bash -c ". $SCRIPTS_DIR/setup-test-env.sh && ${XVFB_SCRIPT}"
+    section_start weston "weston: prepare"
+    . "$CI_PROJECT_DIR/install/common/weston.sh"
+    section_end weston
+    $CI_PROJECT_DIR/install/deqp-runner.sh
 
 softpipe-asan-gles31:
   variables: