From ab1e99de62040f73f4488a99673880f500e670f4 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Mon, 15 Jul 2024 15:09:18 +0200
Subject: [PATCH] ci/vkd3d: rename vkd3d expected failures list to be more
 explicit

And allow for something other than just "failures", such as...
skips and flakes (see next commits).

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30413>
---
 .gitlab-ci/vkd3d-runner.sh                                | 8 ++++----
 src/amd/ci/gitlab-ci-inc.yml                              | 2 +-
 ...{radv-tahiti-vkd3d.txt => radv-tahiti-vkd3d-fails.txt} | 0
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename src/amd/ci/{radv-tahiti-vkd3d.txt => radv-tahiti-vkd3d-fails.txt} (100%)

diff --git a/.gitlab-ci/vkd3d-runner.sh b/.gitlab-ci/vkd3d-runner.sh
index bd5357bd477..8f5516c1694 100755
--- a/.gitlab-ci/vkd3d-runner.sh
+++ b/.gitlab-ci/vkd3d-runner.sh
@@ -38,11 +38,11 @@ if ! vulkaninfo | grep driverInfo | tee /tmp/version.txt | grep -F "Mesa $MESA_V
 fi
 
 # Gather the list expected failures
-EXPECTATIONFILE="$RESULTS/$GPU_VERSION-vkd3d.txt"
-if [ -f "$INSTALL/$GPU_VERSION-vkd3d.txt" ]; then
-    cp "$INSTALL/$GPU_VERSION-vkd3d.txt" "$EXPECTATIONFILE"
+EXPECTATIONFILE="$RESULTS/$GPU_VERSION-vkd3d-fails.txt"
+if [ -f "$INSTALL/$GPU_VERSION-vkd3d-fails.txt" ]; then
+    cp "$INSTALL/$GPU_VERSION-vkd3d-fails.txt" "$EXPECTATIONFILE"
 else
-    printf "%s\n" "$GPU_VERSION-vkd3d.txt not found, assuming a \"no failures\" baseline."
+    printf "%s\n" "$GPU_VERSION-vkd3d-fails.txt not found, assuming a \"no failures\" baseline."
     touch "$EXPECTATIONFILE"
 fi
 
diff --git a/src/amd/ci/gitlab-ci-inc.yml b/src/amd/ci/gitlab-ci-inc.yml
index 15169806361..641f0709c5d 100644
--- a/src/amd/ci/gitlab-ci-inc.yml
+++ b/src/amd/ci/gitlab-ci-inc.yml
@@ -14,7 +14,7 @@
         - src/amd/ci/$GPU_VERSION-flakes.txt
         - src/amd/ci/$GPU_VERSION-skips.txt
         - src/amd/ci/$PIGLIT_TRACES_FILE
-        - src/amd/ci/$GPU_VERSION-vkd3d.txt
+        - src/amd/ci/$GPU_VERSION-vkd3d-fails.txt
         - src/amd/common/**/*
         - src/amd/llvm/**/*
         - src/amd/registers/**/*
diff --git a/src/amd/ci/radv-tahiti-vkd3d.txt b/src/amd/ci/radv-tahiti-vkd3d-fails.txt
similarity index 100%
rename from src/amd/ci/radv-tahiti-vkd3d.txt
rename to src/amd/ci/radv-tahiti-vkd3d-fails.txt