OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: Set the path to the VK drivers during HWCI_START_XORG/WESTON.

Browse Source 
If the test is running with zink, we want zink to be able to find the
vulkan driver.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20503>
This commit is contained in:
Emma Anholt
2022-12-14 15:06:13 -08:00
committed by Marge Bot
parent 01b5e876a2
commit 99a6f2a186
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.gitlab-ci/common/init-stage2.sh
View File

@@ -128,6 +128,7 @@ BACKGROUND_PIDS="$! $BACKGROUND_PIDS"
if [ -n "$HWCI_START_XORG" ]; then if [ -n "$HWCI_START_XORG" ]; then
echo "touch /xorg-started; sleep 100000" > /xorg-script echo "touch /xorg-started; sleep 100000" > /xorg-script
env \ 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 & xinit /bin/sh /xorg-script -- /usr/bin/Xorg -noreset -s 0 -dpms -logfile /Xorg.0.log &
BACKGROUND_PIDS="$! $BACKGROUND_PIDS" BACKGROUND_PIDS="$! $BACKGROUND_PIDS"
@@ -145,7 +146,9 @@ if [ -n "$HWCI_START_WESTON" ]; then
export XDG_RUNTIME_DIR=/run/user export XDG_RUNTIME_DIR=/run/user
mkdir -p $XDG_RUNTIME_DIR 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 export WAYLAND_DISPLAY=wayland-0
sleep 1 sleep 1
fi fi