From f890d41d46f8a84ed159406f6a5dc91d262a13aa Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniels@collabora.com>
Date: Wed, 21 Aug 2024 12:03:46 +0100
Subject: [PATCH] ci/gtest: Use common $RESULTS_DIR

This means that GTEST_RESULTS_DIR no longer works.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31110>
---
 .gitlab-ci/common/generate-env.sh |  1 -
 .gitlab-ci/gtest-runner.sh        | 11 ++++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci/common/generate-env.sh b/.gitlab-ci/common/generate-env.sh
index 10dc3dc641f..1f9dfd2106b 100755
--- a/.gitlab-ci/common/generate-env.sh
+++ b/.gitlab-ci/common/generate-env.sh
@@ -55,7 +55,6 @@ VARS=(
     GTEST
     GTEST_FAILS
     GTEST_FRACTION
-    GTEST_RESULTS_DIR
     GTEST_RUNNER_OPTIONS
     GTEST_SKIPS
     HWCI_FREQ_MAX
diff --git a/.gitlab-ci/gtest-runner.sh b/.gitlab-ci/gtest-runner.sh
index c4ae1e741db..1cfa80fecc6 100755
--- a/.gitlab-ci/gtest-runner.sh
+++ b/.gitlab-ci/gtest-runner.sh
@@ -8,9 +8,6 @@ INSTALL=$PWD/install
 # Set up the driver environment.
 export LD_LIBRARY_PATH=$INSTALL/lib/
 
-RESULTS="$PWD/${GTEST_RESULTS_DIR:-results}"
-mkdir -p "$RESULTS"
-
 export LIBVA_DRIVERS_PATH=$INSTALL/lib/dri/
 # libva spams driver open info by default, and that happens per testcase.
 export LIBVA_MESSAGING_LEVEL=1
@@ -39,7 +36,7 @@ set +e
 gtest-runner \
     run \
     --gtest $GTEST \
-    --output ${RESULTS} \
+    --output ${RESULTS_DIR} \
     --jobs ${FDO_CI_CONCURRENT:-4} \
     $GTEST_SKIPS \
     --flakes $INSTALL/$GPU_VERSION-flakes.txt \
@@ -52,8 +49,8 @@ GTEST_EXITCODE=$?
 
 deqp-runner junit \
    --testsuite gtest \
-   --results $RESULTS/failures.csv \
-   --output $RESULTS/junit.xml \
+   --results $RESULTS_DIR/failures.csv \
+   --output $RESULTS_DIR/junit.xml \
    --limit 50 \
    --template "See $ARTIFACTS_BASE_URL/results/{{testcase}}.xml"
 
@@ -62,7 +59,7 @@ if [ -n "$FLAKES_CHANNEL" ]; then
   python3 $INSTALL/report-flakes.py \
          --host irc.oftc.net \
          --port 6667 \
-         --results $RESULTS/results.csv \
+         --results $RESULTS_DIR/results.csv \
          --known-flakes $INSTALL/$GPU_VERSION-flakes.txt \
          --channel "$FLAKES_CHANNEL" \
          --runner "$CI_RUNNER_DESCRIPTION" \