From b8c9bbabcfe64fdd13c25edf4e4f940ca6a5e81e Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniels@collabora.com>
Date: Wed, 21 Aug 2024 12:01:01 +0100
Subject: [PATCH] ci/dxvk: Use common results dir

Signed-off-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31110>
---
 .gitlab-ci/vkd3d-runner.sh | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci/vkd3d-runner.sh b/.gitlab-ci/vkd3d-runner.sh
index 0ade794d252..1bb64aa432a 100755
--- a/.gitlab-ci/vkd3d-runner.sh
+++ b/.gitlab-ci/vkd3d-runner.sh
@@ -14,11 +14,6 @@ fi
 
 INSTALL=$(realpath -s "$PWD"/install)
 
-RESULTS=$(realpath -s "$PWD"/results)
-
-# Make sure the results folder exists
-mkdir -p "$RESULTS"
-
 # Set up the driver environment.
 # Modifiying here directly LD_LIBRARY_PATH may cause problems when
 # using a command wrapper. Hence, we will just set it when running the
@@ -51,7 +46,7 @@ if ! vulkaninfo | grep driverInfo | tee /tmp/version.txt | grep -F "Mesa $MESA_V
 fi
 
 # Gather the list expected failures
-EXPECTATIONFILE="$RESULTS/$GPU_VERSION-vkd3d-fails.txt"
+EXPECTATIONFILE="$RESULTS_DIR/$GPU_VERSION-vkd3d-fails.txt"
 if [ -f "$INSTALL/$GPU_VERSION-vkd3d-fails.txt" ]; then
     grep -vE '^(#|$)' "$INSTALL/$GPU_VERSION-vkd3d-fails.txt" | sort > "$EXPECTATIONFILE"
 else
@@ -90,8 +85,8 @@ fi
 
 printf "%s\n" "Running vkd3d-proton testsuite..."
 
-LOGFILE="$RESULTS/vkd3d-proton-log.txt"
-TEST_LOGS="$PWD/test-logs"
+LOGFILE="$RESULTS_DIR/vkd3d-proton-log.txt"
+TEST_LOGS="$RESULTS_DIR/test-logs"
 (cd /vkd3d-proton-tests && tests/test-runner.sh x64/bin/d3d12 --jobs "${FDO_CI_CONCURRENT:-4}" --output-dir "$TEST_LOGS" | tee "$LOGFILE")
 
 printf '\n\n'