fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-28 08:10:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zink/ci: Use Weston's Xwayland instead of Xvfb

Browse source 
Signed-off-by: Valentine Burley <valentine.burley@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36567>
This commit is contained in:
Valentine Burley 2025-07-28 14:37:57 +02:00 • committed by Marge Bot
parent a08d8b4640
commit 5742f6f2db
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/gallium/drivers/zink/ci/gitlab-ci.yml
View file

@ -17,11 +17,14 @@ zink-lavapipe:
# Enable validation (except for on piglit, see deqp-zink-lavapipe.toml), logging
# to stdout and aborting on unknown failures.
ZINK_DEBUG: validation
XVFB_SCRIPT: "VK_DRIVER=lvp install/deqp-runner.sh"
VK_DRIVER: lvp
script: |
export LD_LIBRARY_PATH="$CI_PROJECT_DIR/install/lib"
export LIBGL_DRIVERS_PATH="$CI_PROJECT_DIR/install/lib/dri"
xvfb-run --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
zink-venus-lavapipe:
extends:
@ -41,14 +44,16 @@ zink-venus-lavapipe:
LP_NUM_THREADS: 2
CROSVM_MEMORY: 12288
CROSVM_CPU: $FDO_CI_CONCURRENT
XVFB_SCRIPT: "./install/crosvm-runner.sh ./install/deqp-runner.sh"
# INFO: Keep Linux version at 6.14 as 6.16 seems to have regressed
# in virtio gfx device initializaiton
KERNEL_TAG: "v6.14-mesa-4277"
script: |
export LD_LIBRARY_PATH="$CI_PROJECT_DIR/install/lib"
export LIBGL_DRIVERS_PATH="$CI_PROJECT_DIR/install/lib/dri"
xvfb-run --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/crosvm-runner.sh $CI_PROJECT_DIR/install/deqp-runner.sh
zink-venus-lavapipe-full:
extends: