AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci/swrast: Fix library paths for llvmpipe/softpipe

Browse Source 
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 <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:39:52 -04:00
committed by Marge Bot
parent a3560fabc6
commit 8b594d29b6
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml
+5 -2
View File
@@ -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:
src/gallium/drivers/softpipe/ci/gitlab-ci.yml
+3 -1
View File
@@ -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: