ci/piglit-runner: Merge piglit-driver-*.txt files into driver-*.txt.

The test names are definitely unique (deqp has specific prefixes, piglit
uses '@' as a separator instead of '.'), so we can just have a single file
regardless of test type.  Merges the two groups of xfails together so you
can't mix up which file to edit (I certainly have), and so that we don't
need to introduce yet another set of files when we add gtest for libva.

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Acked-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Acked-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13517>
(cherry picked from commit bfbc41a9fa8aeeae7d5a441940538a5a7bb9f027)

3 files changed, 22 insertions, 21 deletions

diff --git a/.gitlab-ci/all-skips.txt b/.gitlab-ci/all-skips.txt
index 031aff8167c..52a8e87f362 100644
--- a/.gitlab-ci/all-skips.txt
+++ b/.gitlab-ci/all-skips.txt
@@ -8,3 +8,10 @@ dEQP-GLES[0-9]*.functional.flush_finish.*
 
 # https://gitlab.freedesktop.org/mesa/mesa/-/issues/4575
 dEQP-VK.wsi.display.get_display_plane_capabilities
+
+# piglit: WGL is Windows-only
+wgl@.*
+
+# These are sensitive to CPU timing, and would need to be run in isolation
+# on the system rather than in parallel with other tests.
+glx@glx_arb_sync_control@timing.*
diff --git a/.gitlab-ci/piglit/piglit-all-skips.txt b/.gitlab-ci/piglit/piglit-all-skips.txt
deleted file mode 100644
index e102ac6cf41..00000000000
--- a/.gitlab-ci/piglit/piglit-all-skips.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# WGL is Windows-only
-wgl@.*
-
-# These are sensitive to CPU timing, and would need to be run in isolation
-# on the system rather than in parallel with other tests.
-glx@glx_arb_sync_control@timing.*
diff --git a/.gitlab-ci/piglit/piglit-runner.sh b/.gitlab-ci/piglit/piglit-runner.sh
index e716ed63257..d228f6cea37 100755
--- a/.gitlab-ci/piglit/piglit-runner.sh
+++ b/.gitlab-ci/piglit/piglit-runner.sh
@@ -3,7 +3,7 @@
 set -ex
 
 if [ -z "$GPU_VERSION" ]; then
-   echo 'GPU_VERSION must be set to something like "llvmpipe" or "freedreno-a630" (the name used in your ci/piglit-gpu-version-*.txt)'
+   echo 'GPU_VERSION must be set to something like "llvmpipe" or "freedreno-a630" (the name used in your ci/gpu-version-*.txt)'
    exit 1
 fi
 
@@ -28,27 +28,27 @@ if [ -n "$CI_NODE_INDEX" ]; then
    PIGLIT_RUNNER_OPTIONS="$PIGLIT_RUNNER_OPTIONS --fraction-start ${CI_NODE_INDEX}"
 fi
 
-if [ -e "$INSTALL/piglit-$GPU_VERSION-fails.txt" ]; then
-    PIGLIT_RUNNER_OPTIONS="$PIGLIT_RUNNER_OPTIONS --baseline $INSTALL/piglit-$GPU_VERSION-fails.txt"
+if [ -e "$INSTALL/$GPU_VERSION-fails.txt" ]; then
+    PIGLIT_RUNNER_OPTIONS="$PIGLIT_RUNNER_OPTIONS --baseline $INSTALL/$GPU_VERSION-fails.txt"
 fi
 
 # Default to an empty known flakes file if it doesn't exist.
-touch $INSTALL/piglit-$GPU_VERSION-flakes.txt
+touch $INSTALL/$GPU_VERSION-flakes.txt
 
-if [ -n "$VK_DRIVER" ] && [ -e "$INSTALL/piglit-$VK_DRIVER-skips.txt" ]; then
-    PIGLIT_SKIPS="$PIGLIT_SKIPS $INSTALL/piglit-$VK_DRIVER-skips.txt"
+if [ -n "$VK_DRIVER" ] && [ -e "$INSTALL/$VK_DRIVER-skips.txt" ]; then
+    PIGLIT_SKIPS="$PIGLIT_SKIPS $INSTALL/$VK_DRIVER-skips.txt"
 fi
 
-if [ -n "$GALLIUM_DRIVER" ] && [ -e "$INSTALL/piglit-$GALLIUM_DRIVER-skips.txt" ]; then
-    PIGLIT_SKIPS="$PIGLIT_SKIPS $INSTALL/piglit-$GALLIUM_DRIVER-skips.txt"
+if [ -n "$GALLIUM_DRIVER" ] && [ -e "$INSTALL/$GALLIUM_DRIVER-skips.txt" ]; then
+    PIGLIT_SKIPS="$PIGLIT_SKIPS $INSTALL/$GALLIUM_DRIVER-skips.txt"
 fi
 
-if [ -n "$DRIVER_NAME" ] && [ -e "$INSTALL/piglit-$DRIVER_NAME-skips.txt" ]; then
-    PIGLIT_SKIPS="$PIGLIT_SKIPS $INSTALL/piglit-$DRIVER_NAME-skips.txt"
+if [ -n "$DRIVER_NAME" ] && [ -e "$INSTALL/$DRIVER_NAME-skips.txt" ]; then
+    PIGLIT_SKIPS="$PIGLIT_SKIPS $INSTALL/$DRIVER_NAME-skips.txt"
 fi
 
-if [ -e "$INSTALL/piglit-$GPU_VERSION-skips.txt" ]; then
-    PIGLIT_SKIPS="$PIGLIT_SKIPS $INSTALL/piglit-$GPU_VERSION-skips.txt"
+if [ -e "$INSTALL/$GPU_VERSION-skips.txt" ]; then
+    PIGLIT_SKIPS="$PIGLIT_SKIPS $INSTALL/$GPU_VERSION-skips.txt"
 fi
 
 set +e
@@ -58,8 +58,8 @@ piglit-runner \
     --piglit-folder /piglit \
     --output $RESULTS \
     --jobs ${FDO_CI_CONCURRENT:-4} \
-    --skips $INSTALL/piglit/piglit-all-skips.txt $PIGLIT_SKIPS \
-    --flakes $INSTALL/piglit-$GPU_VERSION-flakes.txt \
+    --skips $INSTALL/all-skips.txt $PIGLIT_SKIPS \
+    --flakes $INSTALL/$GPU_VERSION-flakes.txt \
     --profile $PIGLIT_PROFILES \
     --process-isolation \
     $PIGLIT_RUNNER_OPTIONS \
@@ -80,7 +80,7 @@ if [ -n "$FLAKES_CHANNEL" ]; then
          --host irc.oftc.net \
          --port 6667 \
          --results $RESULTS/results.csv \
-         --known-flakes $INSTALL/piglit-$GPU_VERSION-flakes.txt \
+         --known-flakes $INSTALL/$GPU_VERSION-flakes.txt \
          --channel "$FLAKES_CHANNEL" \
          --runner "$CI_RUNNER_DESCRIPTION" \
          --job "$CI_JOB_ID" \