From 99a6f2a1864fe65a764e2963a41763bcbf541196 Mon Sep 17 00:00:00 2001 From: Emma Anholt Date: Wed, 14 Dec 2022 15:06:13 -0800 Subject: [PATCH] ci: Set the path to the VK drivers during HWCI_START_XORG/WESTON. If the test is running with zink, we want zink to be able to find the vulkan driver. Part-of: --- .gitlab-ci/common/init-stage2.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci/common/init-stage2.sh b/.gitlab-ci/common/init-stage2.sh index 156ce0e3e64..beb86f5f12e 100755 --- a/.gitlab-ci/common/init-stage2.sh +++ b/.gitlab-ci/common/init-stage2.sh @@ -128,6 +128,7 @@ BACKGROUND_PIDS="$! $BACKGROUND_PIDS" if [ -n "$HWCI_START_XORG" ]; then echo "touch /xorg-started; sleep 100000" > /xorg-script env \ + VK_ICD_FILENAMES=/install/share/vulkan/icd.d/$(VK_DRIVER)_icd.`uname -m`.json \ xinit /bin/sh /xorg-script -- /usr/bin/Xorg -noreset -s 0 -dpms -logfile /Xorg.0.log & BACKGROUND_PIDS="$! $BACKGROUND_PIDS" @@ -145,7 +146,9 @@ if [ -n "$HWCI_START_WESTON" ]; then export XDG_RUNTIME_DIR=/run/user mkdir -p $XDG_RUNTIME_DIR - weston -Bheadless-backend.so --use-gl -Swayland-0 & + env \ + VK_ICD_FILENAMES=/install/share/vulkan/icd.d/$(VK_DRIVER)_icd.`uname -m`.json \ + weston -Bheadless-backend.so --use-gl -Swayland-0 & export WAYLAND_DISPLAY=wayland-0 sleep 1 fi