From e876a018e91554f6588c1017d2a8907bced53ff5 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Wed, 12 Apr 2023 11:06:02 +0100
Subject: [PATCH] ci: stop removing -x11 suffix for x11 build of deqp-egl

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>
---
 .gitlab-ci/container/build-deqp.sh                      | 4 ----
 src/broadcom/ci/deqp-broadcom-rpi3.toml                 | 2 +-
 src/broadcom/ci/deqp-broadcom-rpi4.toml                 | 2 +-
 src/freedreno/ci/deqp-freedreno-a618-egl.toml           | 2 +-
 src/freedreno/ci/deqp-freedreno-a630-egl.toml           | 2 +-
 src/gallium/drivers/lima/ci/deqp-lima-mali450-deqp.toml | 2 +-
 src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe.toml      | 2 +-
 src/gallium/drivers/zink/ci/deqp-zink-anv-tgl-full.toml | 2 +-
 src/intel/ci/deqp-iris-amly-egl.toml                    | 2 +-
 src/intel/ci/deqp-iris-apl-egl.toml                     | 2 +-
 src/intel/ci/deqp-iris-apl-glk.toml                     | 2 +-
 src/intel/ci/deqp-iris-glk-egl.toml                     | 2 +-
 src/panfrost/ci/deqp-panfrost-t860-egl.toml             | 2 +-
 13 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/.gitlab-ci/container/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh
index 9decf96..7c30632 100644
--- a/.gitlab-ci/container/build-deqp.sh
+++ b/.gitlab-ci/container/build-deqp.sh
@@ -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
diff --git a/src/broadcom/ci/deqp-broadcom-rpi3.toml b/src/broadcom/ci/deqp-broadcom-rpi3.toml
index 7fff18e..56b4c09 100644
--- a/src/broadcom/ci/deqp-broadcom-rpi3.toml
+++ b/src/broadcom/ci/deqp-broadcom-rpi3.toml
@@ -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",
diff --git a/src/broadcom/ci/deqp-broadcom-rpi4.toml b/src/broadcom/ci/deqp-broadcom-rpi4.toml
index 1b9f2af..9bfe9f0 100644
--- a/src/broadcom/ci/deqp-broadcom-rpi4.toml
+++ b/src/broadcom/ci/deqp-broadcom-rpi4.toml
@@ -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",
diff --git a/src/freedreno/ci/deqp-freedreno-a618-egl.toml b/src/freedreno/ci/deqp-freedreno-a618-egl.toml
index b7f89ee..38dfd7c 100644
--- a/src/freedreno/ci/deqp-freedreno-a618-egl.toml
+++ b/src/freedreno/ci/deqp-freedreno-a618-egl.toml
@@ -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 = [
diff --git a/src/freedreno/ci/deqp-freedreno-a630-egl.toml b/src/freedreno/ci/deqp-freedreno-a630-egl.toml
index 5e583a2..ff9a6b5 100644
--- a/src/freedreno/ci/deqp-freedreno-a630-egl.toml
+++ b/src/freedreno/ci/deqp-freedreno-a630-egl.toml
@@ -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 = [
diff --git a/src/gallium/drivers/lima/ci/deqp-lima-mali450-deqp.toml b/src/gallium/drivers/lima/ci/deqp-lima-mali450-deqp.toml
index 53fe452..a42b964 100644
--- a/src/gallium/drivers/lima/ci/deqp-lima-mali450-deqp.toml
+++ b/src/gallium/drivers/lima/ci/deqp-lima-mali450-deqp.toml
@@ -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 = [
diff --git a/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe.toml b/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe.toml
index e6acf10..757956f 100644
--- a/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe.toml
+++ b/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe.toml
@@ -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",
diff --git a/src/gallium/drivers/zink/ci/deqp-zink-anv-tgl-full.toml b/src/gallium/drivers/zink/ci/deqp-zink-anv-tgl-full.toml
index 8c8b683..f5148d0 100644
--- a/src/gallium/drivers/zink/ci/deqp-zink-anv-tgl-full.toml
+++ b/src/gallium/drivers/zink/ci/deqp-zink-anv-tgl-full.toml
@@ -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",
diff --git a/src/intel/ci/deqp-iris-amly-egl.toml b/src/intel/ci/deqp-iris-amly-egl.toml
index b6d8ca1..234daa3 100644
--- a/src/intel/ci/deqp-iris-amly-egl.toml
+++ b/src/intel/ci/deqp-iris-amly-egl.toml
@@ -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 = [
diff --git a/src/intel/ci/deqp-iris-apl-egl.toml b/src/intel/ci/deqp-iris-apl-egl.toml
index b6d8ca1..234daa3 100644
--- a/src/intel/ci/deqp-iris-apl-egl.toml
+++ b/src/intel/ci/deqp-iris-apl-egl.toml
@@ -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 = [
diff --git a/src/intel/ci/deqp-iris-apl-glk.toml b/src/intel/ci/deqp-iris-apl-glk.toml
index b6d8ca1..234daa3 100644
--- a/src/intel/ci/deqp-iris-apl-glk.toml
+++ b/src/intel/ci/deqp-iris-apl-glk.toml
@@ -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 = [
diff --git a/src/intel/ci/deqp-iris-glk-egl.toml b/src/intel/ci/deqp-iris-glk-egl.toml
index b6d8ca1..234daa3 100644
--- a/src/intel/ci/deqp-iris-glk-egl.toml
+++ b/src/intel/ci/deqp-iris-glk-egl.toml
@@ -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 = [
diff --git a/src/panfrost/ci/deqp-panfrost-t860-egl.toml b/src/panfrost/ci/deqp-panfrost-t860-egl.toml
index f2ad014..a9e4c73 100644
--- a/src/panfrost/ci/deqp-panfrost-t860-egl.toml
+++ b/src/panfrost/ci/deqp-panfrost-t860-egl.toml
@@ -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",
-- 
2.7.4