ci: Move PIGLIT_PLATFORM settings out of the .tomls.

I'm going to add some automatic platform-based skips lists shortly (like
all-skips but more targeted), and this avoids needing to add them to each
.toml.

Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Acked-by: Karol Herbst <kherbst@redhat.com>
Acked-by: Martin Roukala <martin.roukala@mupuf.org>
Acked-by: David Heidelberg <david.heidelberg@collabora.com>
Acked-by: Erico Nunes <nunes.erico@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20798>
This commit is contained in:
Emma Anholt 2023-01-19 13:20:27 -08:00 committed by Marge Bot
parent 83c2b26acf
commit ac5b1df2b9
17 changed files with 12 additions and 20 deletions

View file

@ -33,5 +33,4 @@ profile = "gpu"
process_isolation = true
timeout = 180.0
[piglit.env]
PIGLIT_PLATFORM = "mixed_glx_egl"
PIGLIT_NO_WINDOW = "1"

View file

@ -20,6 +20,7 @@
# 12 devices (2023-01-10)
RUNNER_TAG: mesa-ci-x86-64-lava-acer-R721T-grunt
DEVICE_TYPE: acer-R721T-grunt
PIGLIT_PLATFORM: mixed_glx_egl
.radv-stoney-test:amd64:
extends:

View file

@ -29,5 +29,3 @@ deqp_args = [
piglit_folder = "/piglit"
profile = "quick_shader"
process_isolation = true
[piglit.env]
PIGLIT_PLATFORM = "gbm"

View file

@ -19,6 +19,7 @@ vc4-rpi3:armhf:
variables:
HWCI_TEST_SCRIPT: "/install/deqp-runner.sh"
DEQP_SUITE: broadcom-rpi3
PIGLIT_PLATFORM: gbm
vc4-rpi3-egl:armhf:
extends:

View file

@ -49,5 +49,3 @@ piglit_folder = "/piglit"
# they're covered by the llvmpipe run.
profile = "quick_shader"
process_isolation = true
[piglit.env]
PIGLIT_PLATFORM = "gbm"

View file

@ -99,6 +99,7 @@ a530_gl:
- .test-manual-mr # Unstable as of kernel 5.19
variables:
DEQP_SUITE: freedreno-a530
PIGLIT_PLATFORM: gbm
parallel: 6
.a530_piglit:

View file

@ -28,5 +28,3 @@ piglit_folder = "/piglit"
# they're covered by the llvmpipe run.
profile = "gpu"
process_isolation = true
[piglit.env]
PIGLIT_PLATFORM = "gbm"

View file

@ -67,5 +67,3 @@ piglit_folder = "/piglit"
# they're covered by the llvmpipe run.
profile = "gpu"
process_isolation = true
[piglit.env]
PIGLIT_PLATFORM = "gbm"

View file

@ -28,6 +28,7 @@ crocus-g41:
- .deqp-test
variables:
DEQP_SUITE: crocus-g41
PIGLIT_PLATFORM: gbm
crocus-hsw:
extends:
@ -35,6 +36,7 @@ crocus-hsw:
- .deqp-test
variables:
DEQP_SUITE: crocus-hsw
PIGLIT_PLATFORM: gbm
crocus-g41-traces:
extends:

View file

@ -28,5 +28,3 @@ piglit_folder = "/piglit"
# they're covered by the llvmpipe run.
profile = "gpu"
process_isolation = true
[piglit.env]
PIGLIT_PLATFORM = "gbm"

View file

@ -16,6 +16,7 @@ i915-g33:
- .deqp-test
variables:
DEQP_SUITE: i915g
PIGLIT_PLATFORM: gbm
i915-g33-traces:
extends:

View file

@ -2,5 +2,3 @@
piglit_folder = "/piglit"
profile = "gpu"
process_isolation = true
[piglit.env]
PIGLIT_PLATFORM = "gbm"

View file

@ -23,4 +23,5 @@ lima-mali450-piglit:arm64:
- .lava-meson-gxl-s805x-libretech-ac
variables:
DEQP_SUITE: lima-mali450-piglit
PIGLIT_PLATFORM: gbm
parallel: 2

View file

@ -57,5 +57,3 @@ tests_per_group = 1
piglit_folder = "/piglit"
profile = "quick"
process_isolation = true
[piglit.env]
PIGLIT_PLATFORM = "x11_egl"

View file

@ -15,6 +15,7 @@ virpipe-on-gl:
variables:
DEQP_SUITE: virpipe-gl
GPU_VERSION: virpipe-gl
PIGLIT_PLATFORM: x11_egl
tags:
- mesa-swrast

View file

@ -120,8 +120,3 @@ piglit_folder = "/piglit"
profile = "gpu"
process_isolation = true
timeout = 180.0
# We use gbm because X can die:
# MESA: error: ZINK: vkQueueSubmit failed (VK_ERROR_DEVICE_LOST)
# Xorg: ../src/gallium/drivers/zink/zink_batch.c:599: zink_end_batch: Assertion `!ctx->batch_states' failed.
[piglit.env]
PIGLIT_PLATFORM = "gbm"

View file

@ -56,6 +56,10 @@ zink-anv-tgl:
DEQP_SUITE: zink-anv-tgl
PIGLIT_NO_WINDOW: 1
HWCI_START_XORG: 1
# We use gbm because X can die:
# MESA: error: ZINK: vkQueueSubmit failed (VK_ERROR_DEVICE_LOST)
# Xorg: ../src/gallium/drivers/zink/zink_batch.c:599: zink_end_batch: Assertion `!ctx->batch_states' failed.
PIGLIT_PLATFORM: gbm
# Manual full run when you want to double-check the full status.
zink-anv-tgl-full: