diff options
| author | Charlie Turner <cturner@igalia.com> | 2021-06-16 15:59:15 +0100 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-09-14 11:31:26 +0000 |
| commit | 852904e9fd87cda232614aaeb03e8ca324cb8a41 (patch) | |
| tree | 509fc610bf2e6ab6a78001b8b869a8e4de166d5a /.gitlab-ci | |
| parent | e43797ab13b3f547a4457548da8ca57f4cb8d2d7 (diff) | |
ci: Support per-driver skip lists.
In addition to a global skip list introduced in
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11333
(enabled by
https://gitlab.freedesktop.org/anholt/deqp-runner/-/merge_requests/4)
it is also useful to have a per-driver skip list in addition to a
per-gpu list. Now, there are multiple levels at which skips can be
specified, from least to most specific,
- (deqp|piglit)-all-skips.txt :: affecting all tests
- (deqp|piglit)-$(DRIVER_NAME|VK_DRIVER|GALLIUM_DRIVER)-skips.txt ::
affecting the specified driver
- (deqp|piglit)-$GPU_VERSION-skips.txt :: affecting a specific GPU
This idea could be useful for -fails.txt as well.
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Martin Peres <martin.peres@mupuf.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11426>
Diffstat (limited to '.gitlab-ci')
| -rwxr-xr-x | .gitlab-ci/deqp-runner.sh | 15 | ||||
| -rwxr-xr-x | .gitlab-ci/piglit/piglit-runner.sh | 14 |
2 files changed, 27 insertions, 2 deletions
diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh index cdc089501aa..7963ef77431 100755 --- a/.gitlab-ci/deqp-runner.sh +++ b/.gitlab-ci/deqp-runner.sh @@ -101,8 +101,21 @@ fi # Default to an empty known flakes file if it doesn't exist. touch $INSTALL/deqp-$GPU_VERSION-flakes.txt + +if [ -n "$VK_DRIVER" ] && [ -e "$INSTALL/deqp-$VK_DRIVER-skips.txt" ]; then + DEQP_SKIPS="$DEQP_SKIPS $INSTALL/deqp-$VK_DRIVER-skips.txt" +fi + +if [ -n "$GALLIUM_DRIVER" ] && [ -e "$INSTALL/deqp-$GALLIUM_DRIVER-skips.txt" ]; then + DEQP_SKIPS="$DEQP_SKIPS $INSTALL/deqp-$GALLIUM_DRIVER-skips.txt" +fi + +if [ -n "$DRIVER_NAME" ] && [ -e "$INSTALL/deqp-$DRIVER_NAME-skips.txt" ]; then + DEQP_SKIPS="$DEQP_SKIPS $INSTALL/deqp-$DRIVER_NAME-skips.txt" +fi + if [ -e "$INSTALL/deqp-$GPU_VERSION-skips.txt" ]; then - DEQP_SKIPS="$INSTALL/deqp-$GPU_VERSION-skips.txt" + DEQP_SKIPS="$DEQP_SKIPS $INSTALL/deqp-$GPU_VERSION-skips.txt" fi set +e diff --git a/.gitlab-ci/piglit/piglit-runner.sh b/.gitlab-ci/piglit/piglit-runner.sh index decb6888e0a..ed100a010db 100755 --- a/.gitlab-ci/piglit/piglit-runner.sh +++ b/.gitlab-ci/piglit/piglit-runner.sh @@ -35,8 +35,20 @@ fi # Default to an empty known flakes file if it doesn't exist. touch $INSTALL/piglit-$GPU_VERSION-flakes.txt +if [ -n "$VK_DRIVER" ] && [ -e "$INSTALL/piglit-$VK_DRIVER-skips.txt" ]; then + PIGLIT_SKIPS="$PIGLIT_SKIPS $INSTALL/piglit-$VK_DRIVER-skips.txt" +fi + +if [ -n "$GALLIUM_DRIVER" ] && [ -e "$INSTALL/piglit-$GALLIUM_DRIVER-skips.txt" ]; then + PIGLIT_SKIPS="$PIGLIT_SKIPS $INSTALL/piglit-$GALLIUM_DRIVER-skips.txt" +fi + +if [ -n "$DRIVER_NAME" ] && [ -e "$INSTALL/piglit-$DRIVER_NAME-skips.txt" ]; then + PIGLIT_SKIPS="$PIGLIT_SKIPS $INSTALL/piglit-$DRIVER_NAME-skips.txt" +fi + if [ -e "$INSTALL/piglit-$GPU_VERSION-skips.txt" ]; then - PIGLIT_SKIPS="$INSTALL/piglit-$GPU_VERSION-skips.txt" + PIGLIT_SKIPS="$PIGLIT_SKIPS $INSTALL/piglit-$GPU_VERSION-skips.txt" fi set +e |