ci/vkd3d: add support for *-skips.txt list files

Allows annotating the skips to document them, and avoids running the
entire CI for that driver when changing the skips for one device.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30413>
This commit is contained in:
Eric Engestrom 2024-07-25 19:41:09 +02:00 committed by Marge Bot
parent ab1e99de62
commit f54cb2476f
5 changed files with 16 additions and 3 deletions

View File

@ -120,7 +120,6 @@ VARS=(
VIRGL_RENDER_SERVER
WAFFLE_PLATFORM
VK_DRIVER
VKD3D_TEST_EXCLUDE
ZINK_DESCRIPTORS
ZINK_DEBUG
LVP_POISON_MEMORY

View File

@ -2,6 +2,11 @@
set -ex
comma_separated() {
local IFS=,
echo "$*"
}
if [[ -z "$VK_DRIVER" ]]; then
exit 1
fi
@ -29,6 +34,12 @@ export WINEDEBUG="-all"
export WINEPREFIX="/vkd3d-proton-wine64"
export WINEESYNC=1
if [ -f "$INSTALL/$GPU_VERSION-vkd3d-skips.txt" ]; then
mapfile -t skips < <(grep -vE '^#|^$' "$INSTALL/$GPU_VERSION-vkd3d-skips.txt")
VKD3D_TEST_EXCLUDE=$(comma_separated "${skips[@]}")
export VKD3D_TEST_EXCLUDE
fi
# Sanity check to ensure that our environment is sufficient to make our tests
# run against the Mesa built by CI, rather than any installed distro version.
MESA_VERSION=$(cat "$INSTALL/VERSION")

View File

@ -15,6 +15,7 @@
- src/amd/ci/$GPU_VERSION-skips.txt
- src/amd/ci/$PIGLIT_TRACES_FILE
- src/amd/ci/$GPU_VERSION-vkd3d-fails.txt
- src/amd/ci/$GPU_VERSION-vkd3d-skips.txt
- src/amd/common/**/*
- src/amd/llvm/**/*
- src/amd/registers/**/*

View File

@ -322,8 +322,6 @@ vkd3d-tahiti-valve:
- .radv-valve-manual-rules
variables:
GPU_VERSION: radv-tahiti
# These vkd3d-proton tests are skipped because they trigger GPU hangs.
VKD3D_TEST_EXCLUDE: test_execute_indirect_state,test_execute_indirect_state_predication,test_undefined_descriptor_heap_mismatch_types
vkd3d-polaris10-valve:
extends:

View File

@ -0,0 +1,4 @@
# These vkd3d-proton tests are skipped because they trigger GPU hangs.
test_execute_indirect_state
test_execute_indirect_state_predication
test_undefined_descriptor_heap_mismatch_types