From 08e5a5092129e14509f99fb4006b49e5f0310980 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Tue, 19 Nov 2024 13:48:34 +0100
Subject: [PATCH] ci/deqp: move testlog-to-* tools to /deqp

While at it, make it a move instead of copy + delete.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32250>
---
 .gitlab-ci/container/build-deqp.sh | 4 +---
 .gitlab-ci/cuttlefish-runner.sh    | 2 +-
 .gitlab-ci/deqp-runner.sh          | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci/container/build-deqp.sh b/.gitlab-ci/container/build-deqp.sh
index 9bcd7cc4ef3..fa5ba19476e 100644
--- a/.gitlab-ci/container/build-deqp.sh
+++ b/.gitlab-ci/container/build-deqp.sh
@@ -229,10 +229,8 @@ if [ "${DEQP_TARGET}" != 'android' ]; then
 
     # Save *some* executor utils, but otherwise strip things down
     # to reduct deqp build size:
-    mkdir /deqp/executor.save
-    cp /deqp/executor/testlog-to-* /deqp/executor.save
+    mv /deqp/executor/testlog-to-* /deqp
     rm -rf /deqp/executor
-    mv /deqp/executor.save /deqp/executor
 fi
 
 # Compress the caselists, since Vulkan's in particular are gigantic; higher
diff --git a/.gitlab-ci/cuttlefish-runner.sh b/.gitlab-ci/cuttlefish-runner.sh
index b7c3c880666..3d0c60fee51 100755
--- a/.gitlab-ci/cuttlefish-runner.sh
+++ b/.gitlab-ci/cuttlefish-runner.sh
@@ -101,7 +101,7 @@ $ADB shell "mkdir ${AOSP_RESULTS}; cd ${AOSP_RESULTS}/..; ./deqp-runner \
     --output $RESULTS \
     --skips /data/all-skips.txt $DEQP_SKIPS \
     --flakes /data/$GPU_VERSION-flakes.txt \
-    --testlog-to-xml /deqp/executor/testlog-to-xml \
+    --testlog-to-xml /deqp/testlog-to-xml \
     --fraction-start ${CI_NODE_INDEX:-1} \
     --fraction $(( CI_NODE_TOTAL * ${DEQP_FRACTION:-1})) \
     --jobs ${FDO_CI_CONCURRENT:-4} \
diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh
index 46f03331429..90051e7e5f3 100755
--- a/.gitlab-ci/deqp-runner.sh
+++ b/.gitlab-ci/deqp-runner.sh
@@ -206,7 +206,7 @@ if [ -z "$DEQP_SUITE" ]; then
         --caselist /tmp/case-list.txt \
         --skips $INSTALL/all-skips.txt $DEQP_SKIPS \
         --flakes $INSTALL/$GPU_VERSION-flakes.txt \
-        --testlog-to-xml /deqp/executor/testlog-to-xml \
+        --testlog-to-xml /deqp/testlog-to-xml \
         --jobs ${FDO_CI_CONCURRENT:-4} \
         $DEQP_RUNNER_OPTIONS \
         -- \
@@ -222,7 +222,7 @@ else
         --output $RESULTS_DIR \
         --skips $INSTALL/all-skips.txt $DEQP_SKIPS \
         --flakes $INSTALL/$GPU_VERSION-flakes.txt \
-        --testlog-to-xml /deqp/executor/testlog-to-xml \
+        --testlog-to-xml /deqp/testlog-to-xml \
         --fraction-start ${CI_NODE_INDEX:-1} \
         --fraction $((CI_NODE_TOTAL * ${DEQP_FRACTION:-1})) \
         --jobs ${FDO_CI_CONCURRENT:-4} \