From 3e7c9aad8a390b0911317e273e6e61589a2d82b9 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Mon, 7 Oct 2024 16:48:16 -0400 Subject: [PATCH] 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 Part-of: --- src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml | 6 ++++-- src/gallium/drivers/zink/ci/gitlab-ci.yml | 6 ++++-- src/virtio/ci/gitlab-ci.yml | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml b/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml index 407045dc832..710130e02de 100644 --- a/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml +++ b/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml @@ -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: diff --git a/src/gallium/drivers/zink/ci/gitlab-ci.yml b/src/gallium/drivers/zink/ci/gitlab-ci.yml index e626ebf063c..90a06c6ae19 100644 --- a/src/gallium/drivers/zink/ci/gitlab-ci.yml +++ b/src/gallium/drivers/zink/ci/gitlab-ci.yml @@ -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: diff --git a/src/virtio/ci/gitlab-ci.yml b/src/virtio/ci/gitlab-ci.yml index 0be340963e0..153a0a8510e 100644 --- a/src/virtio/ci/gitlab-ci.yml +++ b/src/virtio/ci/gitlab-ci.yml @@ -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: