zink/ci: merge GLCTS testing with GLESx for RADV

Both testsuites used to be executed separately because of spurious
failures/hangs but they seem fixed now.

GLCTS+GLES might be faster to run now.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25062>
This commit is contained in:
Samuel Pitoiset 2023-09-05 17:54:30 +02:00 committed by Marge Bot
parent 938465ccac
commit b2ce36b40b
2 changed files with 15 additions and 4 deletions

View file

@ -16,10 +16,7 @@ function execute_testsuite {
fi
}
echo -e "\n# GL CTS testing"
DEQP_VER=gl46 execute_testsuite gl ./install/deqp-runner.sh
echo -e "\n# GLES CTS testing"
echo -e "\n# GLES/GL CTS testing"
DEQP_SUITE=zink-radv execute_testsuite gles ./install/deqp-runner.sh
echo -e "\n# Piglit testing"

View file

@ -33,3 +33,17 @@ deqp_args = [
"--deqp-visibility=hidden"
]
timeout = 180.0
[[deqp]]
deqp = "/deqp/external/openglcts/modules/glcts"
caselists = [
"/deqp/mustpass/gl46-master.txt",
]
deqp_args = [
"--deqp-surface-width=256",
"--deqp-surface-height=256",
"--deqp-surface-type=pbuffer",
"--deqp-gl-config-name=rgba8888d24s8ms0",
"--deqp-visibility=hidden"
]
timeout = 180.0