From 8b594d29b6c750df680653ba1cd934e22855c290 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Mon, 7 Oct 2024 16:39:52 -0400 Subject: [PATCH] ci/swrast: Fix library paths for llvmpipe/softpipe We need to set $LIBGL_DRIVERS_PATH so Xvfb will pick up the correct DRI modules. We were setting $LD_LIBRARY_PATH, but llvmpipe was getting it wrong, so Weston was picking up the host GLES, which we're about to no longer install. Signed-off-by: Daniel Stone Part-of: --- src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml | 7 +++++-- src/gallium/drivers/softpipe/ci/gitlab-ci.yml | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml b/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml index 02c445d549e..43d970ea5aa 100644 --- a/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml +++ b/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml @@ -32,10 +32,13 @@ llvmpipe: extends: .llvmpipe-deqp-test script: | . "$SCRIPTS_DIR"/setup-test-env.sh + export LD_LIBRARY_PATH="$CI_PROJECT_DIR/install/lib" + export LIBGL_DRIVERS_PATH="$CI_PROJECT_DIR/install/lib/dri" section_start weston "weston: prepare" - LD_LIBRARY_PATH="$PWD/install" weston -Bheadless-backend.so -Swayland-0 --idle-time=0 & + weston -Bheadless-backend.so -Swayland-0 --idle-time=0 & + export WAYLAND_DISPLAY=wayland-0 section_end weston - LD_LIBRARY_PATH="$PWD/install" WAYLAND_DISPLAY=wayland-0 xvfb-run --server-args='-noreset' bash -c ". $SCRIPTS_DIR/setup-test-env.sh && ${XVFB_SCRIPT}" + xvfb-run --server-args='-noreset' bash -c ". $SCRIPTS_DIR/setup-test-env.sh && ${XVFB_SCRIPT}" llvmpipe-full: extends: diff --git a/src/gallium/drivers/softpipe/ci/gitlab-ci.yml b/src/gallium/drivers/softpipe/ci/gitlab-ci.yml index 3f4fa1cd5a7..8ba9f40681a 100644 --- a/src/gallium/drivers/softpipe/ci/gitlab-ci.yml +++ b/src/gallium/drivers/softpipe/ci/gitlab-ci.yml @@ -9,7 +9,9 @@ softpipe: extends: .softpipe-deqp-test script: | . "$SCRIPTS_DIR"/setup-test-env.sh - LD_LIBRARY_PATH=`pwd`/install/lib xvfb-run --server-args='-noreset' bash -c ". $SCRIPTS_DIR/setup-test-env.sh && ${XVFB_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 && ${XVFB_SCRIPT}" softpipe-asan-gles31: variables: