fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-16 05:28:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

broadcom/ci: re-enable egl on wayland

Browse source 
Swap them, as suggested by @enunes, to avoid a ton of timeouts in
wayland if the x11 tests ran first.

Needs to be investigated, but at least like this we can get the CI
coverage back.

Signed-off-by: Eric Engestrom <eric@igalia.com>
Acked-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21453>
This commit is contained in:
Eric Engestrom 2023-02-13 15:25:06 +00:00 • committed by Marge Bot
parent 67b2f48645
commit 2809bb8499
2 changed files with 22 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/broadcom/ci/deqp-broadcom-rpi3-egl.toml
View file

@ -1,3 +1,14 @@
# wayland
[[deqp]]
deqp = "/deqp/modules/egl/deqp-egl-wayland"
caselists = ["/deqp/mustpass/egl-master.txt"]
deqp_args = [
"--deqp-surface-width=256", "--deqp-surface-height=256",
"--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
"--deqp-gl-config-name=rgba8888d24s8ms0",
]
prefix = "wayland-"
# x11
[[deqp]]
deqp = "/deqp/modules/egl/deqp-egl"
@ -8,15 +19,3 @@ deqp_args = [
"--deqp-gl-config-name=rgba8888d24s8ms0",
]
prefix = "x11-"
# Disabled due to timeouts since wayland platform was enabled
# See https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20480#note_1702748
#[[deqp]]
#deqp = "/deqp/modules/egl/deqp-egl-wayland"
#caselists = ["/deqp/mustpass/egl-master.txt"]
#deqp_args = [
# "--deqp-surface-width=256", "--deqp-surface-height=256",
# "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
# "--deqp-gl-config-name=rgba8888d24s8ms0",
#]
#prefix = "wayland-"

23
src/broadcom/ci/deqp-broadcom-rpi4-egl.toml
View file

@ -1,3 +1,14 @@
# wayland
[[deqp]]
deqp = "/deqp/modules/egl/deqp-egl-wayland"
caselists = ["/deqp/mustpass/egl-master.txt"]
deqp_args = [
"--deqp-surface-width=256", "--deqp-surface-height=256",
"--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
"--deqp-gl-config-name=rgba8888d24s8ms0",
]
prefix = "wayland-"
# x11
[[deqp]]
deqp = "/deqp/modules/egl/deqp-egl"
@ -8,15 +19,3 @@ deqp_args = [
"--deqp-gl-config-name=rgba8888d24s8ms0",
]
prefix = "x11-"
# Disabled due to timeouts since wayland platform was enabled
# See https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20480#note_1702748
#[[deqp]]
#deqp = "/deqp/modules/egl/deqp-egl-wayland"
#caselists = ["/deqp/mustpass/egl-master.txt"]
#deqp_args = [
# "--deqp-surface-width=256", "--deqp-surface-height=256",
# "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
# "--deqp-gl-config-name=rgba8888d24s8ms0",
#]
#prefix = "wayland-"