ci: Move zink's validation layer setup to deqp-runner.sh.

I want the path to be always set in case someone wants some
ZINK_DEBUG=validation, rather than having to do it per test job.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22459>
This commit is contained in:
Emma Anholt 2023-04-05 12:31:51 -07:00 committed by Marge Bot
parent 5ae6a9bd70
commit 75a08b04d7
2 changed files with 3 additions and 1 deletions

View File

@ -124,6 +124,9 @@ if [ "$PIGLIT_PLATFORM" = "gbm" ]; then
DEQP_SKIPS="$DEQP_SKIPS $INSTALL/gbm-skips.txt"
fi
# Set the path to VK validation layer settings (in case it ends up getting loaded)
export VK_LAYER_SETTINGS_PATH=$INSTALL/$GPU_VERSION-validation-settings.txt
report_load() {
echo "System load: $(cut -d' ' -f1-3 < /proc/loadavg)"
echo "# of CPU cores: $(cat /proc/cpuinfo | grep processor | wc -l)"

View File

@ -39,7 +39,6 @@ zink-lvp:
# Enable validation (except for on piglit, see deqp-zink-lvp.toml), logging
# to stdout and aborting on unknown failures.
ZINK_DEBUG: validation
VK_LAYER_SETTINGS_PATH: ${CI_PROJECT_DIR}/install/zink-lvp-validation-settings.txt
XVFB_SCRIPT: "GALLIUM_DRIVER=zink VK_DRIVER=lvp install/deqp-runner.sh"
script: |
xvfb-run --server-args='-noreset' bash -c ". $SCRIPTS_DIR/setup-test-env.sh && ${XVFB_SCRIPT}"