From e3a941720e61cbfd69b067adf1a34f5aee23abcd Mon Sep 17 00:00:00 2001
From: Antonio Ospite <antonio.ospite@collabora.com>
Date: Fri, 7 Feb 2025 13:27:46 +0100
Subject: [PATCH] ci/android: move all dEQP handling in one place in
 cuttlefish-runner.sh

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33499>
---
 .gitlab-ci/cuttlefish-runner.sh | 46 ++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/.gitlab-ci/cuttlefish-runner.sh b/.gitlab-ci/cuttlefish-runner.sh
index 52fb4b89407..c301bd66f0e 100755
--- a/.gitlab-ci/cuttlefish-runner.sh
+++ b/.gitlab-ci/cuttlefish-runner.sh
@@ -94,16 +94,6 @@ $ADB shell mount -t overlay -o "$opts" none /vendor
 
 $ADB shell setenforce 0
 
-# deqp
-
-$ADB shell mkdir -p /data/deqp
-$ADB push /deqp-gles/modules/egl/deqp-egl-android /data/deqp
-$ADB push /deqp-gles/mustpass/egl-main.txt.zst /data/deqp
-$ADB push /deqp-vk/external/vulkancts/modules/vulkan/* /data/deqp
-$ADB push /deqp-vk/mustpass/vk-main.txt.zst /data/deqp
-$ADB push /deqp-tools/* /data/deqp
-$ADB push /deqp-runner/deqp-runner /data/deqp
-
 # download Android Mesa from S3
 MESA_ANDROID_ARTIFACT_URL=https://${PIPELINE_ARTIFACTS_BASE}/${S3_ANDROID_ARTIFACT_NAME}.tar.zst
 curl -L --retry 4 -f --retry-all-errors --retry-delay 60 -o ${S3_ANDROID_ARTIFACT_NAME}.tar.zst ${MESA_ANDROID_ARTIFACT_URL}
@@ -113,19 +103,6 @@ rm "${S3_ANDROID_ARTIFACT_NAME}.tar.zst" &
 
 INSTALL="/mesa-android/install"
 
-$ADB push "$INSTALL/all-skips.txt" /data/deqp
-$ADB push "$INSTALL/angle-skips.txt" /data/deqp
-if [ -e "$INSTALL/$GPU_VERSION-flakes.txt" ]; then
-  $ADB push "$INSTALL/$GPU_VERSION-flakes.txt" /data/deqp
-fi
-if [ -e "$INSTALL/$GPU_VERSION-fails.txt" ]; then
-  $ADB push "$INSTALL/$GPU_VERSION-fails.txt" /data/deqp
-fi
-if [ -e "$INSTALL/$GPU_VERSION-skips.txt" ]; then
-  $ADB push "$INSTALL/$GPU_VERSION-skips.txt" /data/deqp
-fi
-$ADB push "$INSTALL/deqp-$DEQP_SUITE.toml" /data/deqp
-
 # replace on /vendor/lib64
 
 $ADB push "$INSTALL/lib/libgallium_dri.so" /vendor/lib64/libgallium_dri.so
@@ -179,6 +156,29 @@ else
   fi
 fi
 
+# deqp
+
+$ADB shell mkdir -p /data/deqp
+$ADB push /deqp-gles/modules/egl/deqp-egl-android /data/deqp
+$ADB push /deqp-gles/mustpass/egl-main.txt.zst /data/deqp
+$ADB push /deqp-vk/external/vulkancts/modules/vulkan/* /data/deqp
+$ADB push /deqp-vk/mustpass/vk-main.txt.zst /data/deqp
+$ADB push /deqp-tools/* /data/deqp
+$ADB push /deqp-runner/deqp-runner /data/deqp
+
+$ADB push "$INSTALL/all-skips.txt" /data/deqp
+$ADB push "$INSTALL/angle-skips.txt" /data/deqp
+if [ -e "$INSTALL/$GPU_VERSION-flakes.txt" ]; then
+  $ADB push "$INSTALL/$GPU_VERSION-flakes.txt" /data/deqp
+fi
+if [ -e "$INSTALL/$GPU_VERSION-fails.txt" ]; then
+  $ADB push "$INSTALL/$GPU_VERSION-fails.txt" /data/deqp
+fi
+if [ -e "$INSTALL/$GPU_VERSION-skips.txt" ]; then
+  $ADB push "$INSTALL/$GPU_VERSION-skips.txt" /data/deqp
+fi
+$ADB push "$INSTALL/deqp-$DEQP_SUITE.toml" /data/deqp
+
 BASELINE=""
 if [ -e "$INSTALL/$GPU_VERSION-fails.txt" ]; then
     BASELINE="--baseline /data/deqp/$GPU_VERSION-fails.txt"