From a2be9897effaf000a26d66d7cc04f285c5eca91d Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Mon, 11 Aug 2025 18:48:00 +0200
Subject: [PATCH] ci/vkd3d: keep tests/ directory structure

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

diff --git a/.gitlab-ci/container/build-vkd3d-proton.sh b/.gitlab-ci/container/build-vkd3d-proton.sh
index c0d411573f1..0b7a40ff12c 100644
--- a/.gitlab-ci/container/build-vkd3d-proton.sh
+++ b/.gitlab-ci/container/build-vkd3d-proton.sh
@@ -42,7 +42,7 @@ meson setup                                           \
 
 ninja -C build install
 
-install -m755 -t "${VKD3D_PROTON_DST_DIR}/" build/tests/d3d12
+install -m755 -t "${VKD3D_PROTON_DST_DIR}/tests" build/tests/d3d12
 
 install -m755 -t "${VKD3D_PROTON_DST_DIR}/tests" tests/test-runner.sh
 popd
diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh
index fb86abafa29..61f8ad178d0 100755
--- a/.gitlab-ci/deqp-runner.sh
+++ b/.gitlab-ci/deqp-runner.sh
@@ -53,15 +53,10 @@ if [ -n "$VKD3D_PROTON_TAG" ]; then
   # Are we using the right vkd3d-proton version?
   ci_tag_test_time_check "VKD3D_PROTON_TAG"
 
-  export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:-}:$INSTALL/lib/:/vkd3d-proton-tests/lib/"
   # Set environment for Wine.
   export WINEDEBUG="-all"
   export WINEPREFIX="/vkd3d-proton-wine64"
   export WINEESYNC=1
-
-  # Work around our install not using the same layout as the build tree (but
-  # vkd3d-proton.sh relies on the current layout).
-  ln -s /vkd3d-proton-tests/d3d12 /vkd3d-proton-tests/tests/d3d12
 fi
 
 
diff --git a/.gitlab-ci/vkd3d-runner.sh b/.gitlab-ci/vkd3d-runner.sh
index 99e4948bf92..f30c587156d 100755
--- a/.gitlab-ci/vkd3d-runner.sh
+++ b/.gitlab-ci/vkd3d-runner.sh
@@ -29,7 +29,7 @@ INSTALL=$(realpath -s "$PWD"/install)
 # Modifiying here directly LD_LIBRARY_PATH may cause problems when
 # using a command wrapper. Hence, we will just set it when running the
 # command.
-export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:-}:$INSTALL/lib/:/vkd3d-proton-tests/lib/"
+export LD_LIBRARY_PATH="${LD_LIBRARY_PATH:-}:$INSTALL/lib/"
 
 
 # Set the Vulkan driver to use.
@@ -102,7 +102,7 @@ printf "%s\n" "Running vkd3d-proton testsuite..."
 LOGFILE="$RESULTS_DIR/vkd3d-proton-log.txt"
 TEST_LOGS="/test-logs"
 pushd /vkd3d-proton-tests
-tests/test-runner.sh ./d3d12 --jobs "${FDO_CI_CONCURRENT:-4}" --output-dir "$TEST_LOGS" | tee "$LOGFILE" || true
+tests/test-runner.sh tests/d3d12 --jobs "${FDO_CI_CONCURRENT:-4}" --output-dir "$TEST_LOGS" | tee "$LOGFILE" || true
 popd
 
 printf '\n\n'