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

ci: stop removing -x11 suffix for x11 build of deqp-egl

Browse source 
Makes it clearer which platform is being run.

Signed-off-by: Eric Engestrom <eric@igalia.com>
Reviewed-by: David Heidelberg <david.heidelberg@collabora.com>
Reviewed-by: Emma Anholt <emma@anholt.net>
Reviewed-by: Helen Koike <helen.koike@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22450>
This commit is contained in:
Eric Engestrom 2023-04-12 11:06:02 +01:00 • committed by Marge Bot
parent 08cf224c4a
commit e876a018e9
13 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitlab-ci/container/build-deqp.sh
View file

@ -64,10 +64,6 @@ cmake -S /VK-GL-CTS -B . -G Ninja \
$EXTRA_CMAKE_ARGS
ninja
if [ "${DEQP_TARGET}" != 'android' ]; then
mv /deqp/modules/egl/deqp-egl-x11 /deqp/modules/egl/deqp-egl
fi
# Copy out the mustpass lists we want.
mkdir /deqp/mustpass
for mustpass in $(< /VK-GL-CTS/external/vulkancts/mustpass/main/vk-default.txt) ; do

2
src/broadcom/ci/deqp-broadcom-rpi3.toml
View file

@ -49,7 +49,7 @@ prefix = "wayland-"
# x11
[[deqp]]
deqp = "/deqp/modules/egl/deqp-egl"
deqp = "/deqp/modules/egl/deqp-egl-x11"
caselists = ["/deqp/mustpass/egl-master.txt"]
deqp_args = [
"--deqp-surface-width=256", "--deqp-surface-height=256",

2
src/broadcom/ci/deqp-broadcom-rpi4.toml
View file

@ -68,7 +68,7 @@ prefix = "wayland-"
# x11
[[deqp]]
deqp = "/deqp/modules/egl/deqp-egl"
deqp = "/deqp/modules/egl/deqp-egl-x11"
caselists = ["/deqp/mustpass/egl-master.txt"]
deqp_args = [
"--deqp-surface-width=256", "--deqp-surface-height=256",

2
src/freedreno/ci/deqp-freedreno-a618-egl.toml
View file

@ -1,6 +1,6 @@
# x11
[[deqp]]
deqp = "/deqp/modules/egl/deqp-egl"
deqp = "/deqp/modules/egl/deqp-egl-x11"
caselists = ["/deqp/mustpass/egl-master.txt"]
skips = ["install/freedreno-a618-premerge-skips.txt"]
deqp_args = [

2
src/freedreno/ci/deqp-freedreno-a630-egl.toml
View file

@ -1,6 +1,6 @@
# x11
[[deqp]]
deqp = "/deqp/modules/egl/deqp-egl"
deqp = "/deqp/modules/egl/deqp-egl-x11"
caselists = ["/deqp/mustpass/egl-master.txt"]
skips = ["install/freedreno-a630-premerge-skips.txt"]
deqp_args = [

2
src/gallium/drivers/lima/ci/deqp-lima-mali450-deqp.toml
View file

@ -24,7 +24,7 @@ prefix = "wayland-"
# x11
[[deqp]]
deqp = "/deqp/modules/egl/deqp-egl"
deqp = "/deqp/modules/egl/deqp-egl-x11"
caselists = ["/deqp/mustpass/egl-master.txt"]
tests_per_group = 250
deqp_args = [

2
src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe.toml
View file

@ -58,7 +58,7 @@ deqp_args = [
]
[[deqp]]
deqp = "/deqp/modules/egl/deqp-egl"
deqp = "/deqp/modules/egl/deqp-egl-x11"
caselists = ["/deqp/mustpass/egl-master.txt"]
deqp_args = [
"--deqp-surface-width=256",

2
src/gallium/drivers/zink/ci/deqp-zink-anv-tgl-full.toml
View file

@ -97,7 +97,7 @@ deqp_args = [
prefix = "multisample-"
[[deqp]]
deqp = "/deqp/modules/egl/deqp-egl"
deqp = "/deqp/modules/egl/deqp-egl-x11"
caselists = ["/deqp/mustpass/egl-master.txt"]
deqp_args = [
"--deqp-surface-width=256", "--deqp-surface-height=256",

2
src/intel/ci/deqp-iris-amly-egl.toml
View file

@ -1,6 +1,6 @@
# x11
[[deqp]]
deqp = "/deqp/modules/egl/deqp-egl"
deqp = "/deqp/modules/egl/deqp-egl-x11"
caselists = ["/deqp/mustpass/egl-master.txt"]
skips = ["/install/iris-skips.txt"]
deqp_args = [

2
src/intel/ci/deqp-iris-apl-egl.toml
View file

@ -1,6 +1,6 @@
# x11
[[deqp]]
deqp = "/deqp/modules/egl/deqp-egl"
deqp = "/deqp/modules/egl/deqp-egl-x11"
caselists = ["/deqp/mustpass/egl-master.txt"]
skips = ["/install/iris-skips.txt"]
deqp_args = [

2
src/intel/ci/deqp-iris-apl-glk.toml
View file

@ -1,6 +1,6 @@
# x11
[[deqp]]
deqp = "/deqp/modules/egl/deqp-egl"
deqp = "/deqp/modules/egl/deqp-egl-x11"
caselists = ["/deqp/mustpass/egl-master.txt"]
skips = ["/install/iris-skips.txt"]
deqp_args = [

2
src/intel/ci/deqp-iris-glk-egl.toml
View file

@ -1,6 +1,6 @@
# x11
[[deqp]]
deqp = "/deqp/modules/egl/deqp-egl"
deqp = "/deqp/modules/egl/deqp-egl-x11"
caselists = ["/deqp/mustpass/egl-master.txt"]
skips = ["/install/iris-skips.txt"]
deqp_args = [

2
src/panfrost/ci/deqp-panfrost-t860-egl.toml
View file

@ -11,7 +11,7 @@ prefix = "wayland-"
# x11
[[deqp]]
deqp = "/deqp/modules/egl/deqp-egl"
deqp = "/deqp/modules/egl/deqp-egl-x11"
caselists = ["/deqp/mustpass/egl-master.txt"]
deqp_args = [
"--deqp-surface-width=256", "--deqp-surface-height=256",