ci/virgl: Fix library path

We need to set $LD_LIBRARY_PATH so we can find GL/Vulkan at all, and
$LIBGL_DRIVERS_PATH so Xvfb will pick up the correct DRI modules.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31281>
This commit is contained in:
Daniel Stone
2024-10-07 16:48:16 -04:00
committed by Marge Bot
parent 4e3e84c240
commit 3e7c9aad8a
3 changed files with 12 additions and 6 deletions

View File

@@ -51,8 +51,10 @@
variables:
GALLIVM_PERF: nopt
FLAKES_CHANNEL: "#virgl-ci"
script:
- xvfb-run --server-args='-noreset' bash -c ". $SCRIPTS_DIR/setup-test-env.sh && GALLIUM_DRIVER=virpipe install/deqp-runner.sh"
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 && GALLIUM_DRIVER=virpipe install/deqp-runner.sh"
.virgl-test:
extends:

View File

@@ -34,8 +34,10 @@ zink-venus-lvp:
LP_NUM_THREADS: 2
CROSVM_MEMORY: 12288
CROSVM_CPU: $FDO_CI_CONCURRENT
script:
- xvfb-run --server-args='-noreset' bash -c "./install/crosvm-runner.sh ./install/deqp-runner.sh"
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 "./install/crosvm-runner.sh ./install/deqp-runner.sh"
zink-anv-adl:
extends:

View File

@@ -14,8 +14,10 @@ venus-lavapipe:
CROSVM_MEMORY: 12288
CROSVM_CPU: $FDO_CI_CONCURRENT
FLAKES_CHANNEL: "#virgl-ci"
script:
- ./install/crosvm-runner.sh ./install/deqp-runner.sh
script: |
export LD_LIBRARY_PATH="$CI_PROJECT_DIR/install/lib"
export LIBGL_DRIVERS_PATH="$CI_PROJECT_DIR/install/lib/dri"
./install/crosvm-runner.sh ./install/deqp-runner.sh
venus-lavapipe-full:
extends: