From 030b5f310b5ba917fe47c46ccd28bcbe754f81a8 Mon Sep 17 00:00:00 2001
From: Antonio Ospite <antonio.ospite@collabora.com>
Date: Mon, 18 Nov 2024 18:12:17 +0100
Subject: [PATCH] ci/android: update list of deqp files pushed to the guest
 system

In particular push all the files in
/deqp-vk/external/vulkancts/modules/vulkan/ and /deqp-tools because they
are needed at runtime.

Reviewed-by: Eric Engestrom <None>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30895>
---
 .gitlab-ci/cuttlefish-runner.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci/cuttlefish-runner.sh b/.gitlab-ci/cuttlefish-runner.sh
index c9431a0ce00..c3e1a96f419 100755
--- a/.gitlab-ci/cuttlefish-runner.sh
+++ b/.gitlab-ci/cuttlefish-runner.sh
@@ -90,6 +90,9 @@ $ADB shell setenforce 0
 
 $ADB push /deqp-gles/modules/egl/deqp-egl-android /data/.
 $ADB push /deqp-gles/assets/gl_cts/data/mustpass/egl/aosp_mustpass/3.2.6.x/egl-main.txt /data/
+$ADB push /deqp-vk/external/vulkancts/modules/vulkan/* /data/.
+$ADB push /deqp-vk/mustpass/vk-main.txt.zst /data/.
+$ADB push /deqp-tools/* /data/.
 $ADB push /deqp-runner/deqp-runner /data/.
 
 # download Android Mesa from S3
@@ -159,7 +162,7 @@ $ADB shell "mkdir ${AOSP_RESULTS}; cd ${AOSP_RESULTS}/..; ./deqp-runner \
     --output $AOSP_RESULTS \
     --skips /data/all-skips.txt $DEQP_SKIPS \
     --flakes /data/$GPU_VERSION-flakes.txt \
-    --testlog-to-xml /deqp-tools/testlog-to-xml \
+    --testlog-to-xml /data/testlog-to-xml \
     --fraction-start ${CI_NODE_INDEX:-1} \
     --fraction $(( CI_NODE_TOTAL * ${DEQP_FRACTION:-1})) \
     --jobs ${FDO_CI_CONCURRENT:-4}"