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:
@@ -51,8 +51,10 @@
|
|||||||
variables:
|
variables:
|
||||||
GALLIVM_PERF: nopt
|
GALLIVM_PERF: nopt
|
||||||
FLAKES_CHANNEL: "#virgl-ci"
|
FLAKES_CHANNEL: "#virgl-ci"
|
||||||
script:
|
script: |
|
||||||
- xvfb-run --server-args='-noreset' bash -c ". $SCRIPTS_DIR/setup-test-env.sh && GALLIUM_DRIVER=virpipe install/deqp-runner.sh"
|
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:
|
.virgl-test:
|
||||||
extends:
|
extends:
|
||||||
|
@@ -34,8 +34,10 @@ zink-venus-lvp:
|
|||||||
LP_NUM_THREADS: 2
|
LP_NUM_THREADS: 2
|
||||||
CROSVM_MEMORY: 12288
|
CROSVM_MEMORY: 12288
|
||||||
CROSVM_CPU: $FDO_CI_CONCURRENT
|
CROSVM_CPU: $FDO_CI_CONCURRENT
|
||||||
script:
|
script: |
|
||||||
- xvfb-run --server-args='-noreset' bash -c "./install/crosvm-runner.sh ./install/deqp-runner.sh"
|
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:
|
zink-anv-adl:
|
||||||
extends:
|
extends:
|
||||||
|
@@ -14,8 +14,10 @@ venus-lavapipe:
|
|||||||
CROSVM_MEMORY: 12288
|
CROSVM_MEMORY: 12288
|
||||||
CROSVM_CPU: $FDO_CI_CONCURRENT
|
CROSVM_CPU: $FDO_CI_CONCURRENT
|
||||||
FLAKES_CHANNEL: "#virgl-ci"
|
FLAKES_CHANNEL: "#virgl-ci"
|
||||||
script:
|
script: |
|
||||||
- ./install/crosvm-runner.sh ./install/deqp-runner.sh
|
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:
|
venus-lavapipe-full:
|
||||||
extends:
|
extends:
|
||||||
|
Reference in New Issue
Block a user