ci: Move the dEQP and traces expectations to the per-driver CI dirs.

This means less custom test-source-dep stuff for these drivers, though it
means that touching the CI expects files will cause a bit more retesting:

- broadcom drivers retest as a group (but Igalia requested that
  organization of CI files)
- radv+radeonsi retest as a group
- lvp+llvmpipe retest as a group

Acked-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9161>

46 files changed, 3 insertions, 7 deletions

diff --git a/.gitlab-ci/prepare-artifacts.sh b/.gitlab-ci/prepare-artifacts.sh
index 6ebf31ab8c9..125b39e2b82 100755
--- a/.gitlab-ci/prepare-artifacts.sh
+++ b/.gitlab-ci/prepare-artifacts.sh
@@ -32,6 +32,9 @@ cp -Rp .gitlab-ci/fossils install/
 cp -Rp .gitlab-ci/fossilize-runner.sh install/
 cp -Rp .gitlab-ci/deqp-runner.sh install/
 cp -Rp ci-expects/*/* install/
+find . -path \*/ci/\*.txt \
+    -o -path \*/ci/\*traces\*.yml \
+    | xargs -I '{}' cp -p '{}' install/
 
 # Tar up the install dir so that symlinks and hardlinks aren't each
 # packed separately in the zip file.
diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml
index 7c69bd4bf11..1cad7e3fe0b 100644
--- a/.gitlab-ci/test-source-dep.yml
+++ b/.gitlab-ci/test-source-dep.yml
@@ -93,7 +93,6 @@
       - src/gallium/drivers/llvmpipe/**/*
       - src/gallium/frontends/lavapipe/**/*
       - src/gallium/winsys/sw/**/*
-      - ci-expects/llvmpipe/*
       when: on_success
     - when: never
 
@@ -146,7 +145,6 @@
       - src/freedreno/vulkan/**/*
       - src/gallium/drivers/freedreno/**/*
       - src/gallium/winsys/freedreno/**/*
-      - ci-expects/freedreno/*
       when: on_success
     - when: never
 
@@ -183,7 +181,6 @@
       - src/gallium/drivers/vc4/**/*
       - src/gallium/winsys/kmsro/**/*
       - src/gallium/winsys/vc4/**/*
-      - ci-expects/vc4/*
       when: on_success
     - when: never
 
@@ -202,7 +199,6 @@
       - src/gallium/drivers/v3d/**/*
       - src/gallium/winsys/kmsro/**/*
       - src/gallium/winsys/v3d/**/*
-      - ci-expects/v3d/*
       when: on_success
     - when: never
 
@@ -215,7 +211,6 @@
       when: on_success
     - changes:
       - src/broadcom/**/*
-      - ci-expects/v3dv/*
       when: on_success
     - when: never
 
@@ -246,7 +241,6 @@
     - changes:
       - src/amd/**/*
       - src/vulkan/**/*
-      - ci-expects/radv/*
       when: on_success
     - when: never
 
@@ -266,7 +260,6 @@
     - changes:
       - src/gallium/drivers/virgl/**/*
       - src/gallium/winsys/virgl/**/*
-      - ci-expects/virgl/*
       when: on_success
     - when: never
 
diff --git a/ci-expects/radv/deqp-radv-default-skips.txt b/src/amd/ci/deqp-radv-default-skips.txt
index 521123c7738..521123c7738 100644
--- a/ci-expects/radv/deqp-radv-default-skips.txt
+++ b/src/amd/ci/deqp-radv-default-skips.txt
diff --git a/ci-expects/radv/deqp-radv-fiji-aco-fails.txt b/src/amd/ci/deqp-radv-fiji-aco-fails.txt
index 99ceff8a585..99ceff8a585 100644
--- a/ci-expects/radv/deqp-radv-fiji-aco-fails.txt
+++ b/src/amd/ci/deqp-radv-fiji-aco-fails.txt
diff --git a/ci-expects/radv/deqp-radv-navi10-aco-fails.txt b/src/amd/ci/deqp-radv-navi10-aco-fails.txt
index 56b05dd196f..56b05dd196f 100644
--- a/ci-expects/radv/deqp-radv-navi10-aco-fails.txt
+++ b/src/amd/ci/deqp-radv-navi10-aco-fails.txt
diff --git a/ci-expects/radv/deqp-radv-navi14-aco-fails.txt b/src/amd/ci/deqp-radv-navi14-aco-fails.txt
index 56b05dd196f..56b05dd196f 100644
--- a/ci-expects/radv/deqp-radv-navi14-aco-fails.txt
+++ b/src/amd/ci/deqp-radv-navi14-aco-fails.txt
diff --git a/ci-expects/radv/deqp-radv-oland-aco-fails.txt b/src/amd/ci/deqp-radv-oland-aco-fails.txt
index f205e2408f0..f205e2408f0 100644
--- a/ci-expects/radv/deqp-radv-oland-aco-fails.txt
+++ b/src/amd/ci/deqp-radv-oland-aco-fails.txt
diff --git a/ci-expects/radv/deqp-radv-pitcairn-aco-fails.txt b/src/amd/ci/deqp-radv-pitcairn-aco-fails.txt
index a756175bc90..a756175bc90 100644
--- a/ci-expects/radv/deqp-radv-pitcairn-aco-fails.txt
+++ b/src/amd/ci/deqp-radv-pitcairn-aco-fails.txt
diff --git a/ci-expects/radv/deqp-radv-polaris10-aco-fails.txt b/src/amd/ci/deqp-radv-polaris10-aco-fails.txt
index e69de29bb2d..e69de29bb2d 100644
--- a/ci-expects/radv/deqp-radv-polaris10-aco-fails.txt
+++ b/src/amd/ci/deqp-radv-polaris10-aco-fails.txt
diff --git a/ci-expects/radv/deqp-radv-polaris10-skips.txt b/src/amd/ci/deqp-radv-polaris10-skips.txt
index d44343fe466..d44343fe466 100644
--- a/ci-expects/radv/deqp-radv-polaris10-skips.txt
+++ b/src/amd/ci/deqp-radv-polaris10-skips.txt
diff --git a/ci-expects/radv/deqp-radv-raven-aco-fails.txt b/src/amd/ci/deqp-radv-raven-aco-fails.txt
index 56b05dd196f..56b05dd196f 100644
--- a/ci-expects/radv/deqp-radv-raven-aco-fails.txt
+++ b/src/amd/ci/deqp-radv-raven-aco-fails.txt
diff --git a/ci-expects/radv/deqp-radv-raven-aco-skips.txt b/src/amd/ci/deqp-radv-raven-aco-skips.txt
index 77f7620934f..77f7620934f 100644
--- a/ci-expects/radv/deqp-radv-raven-aco-skips.txt
+++ b/src/amd/ci/deqp-radv-raven-aco-skips.txt
diff --git a/ci-expects/radv/deqp-radv-sienna_cichlid-aco-fails.txt b/src/amd/ci/deqp-radv-sienna_cichlid-aco-fails.txt
index 56b05dd196f..56b05dd196f 100644
--- a/ci-expects/radv/deqp-radv-sienna_cichlid-aco-fails.txt
+++ b/src/amd/ci/deqp-radv-sienna_cichlid-aco-fails.txt
diff --git a/ci-expects/radv/deqp-radv-vega10-aco-fails.txt b/src/amd/ci/deqp-radv-vega10-aco-fails.txt
index 56b05dd196f..56b05dd196f 100644
--- a/ci-expects/radv/deqp-radv-vega10-aco-fails.txt
+++ b/src/amd/ci/deqp-radv-vega10-aco-fails.txt
diff --git a/ci-expects/radv/traces-radv.yml b/src/amd/ci/traces-radv.yml
index 49743a1a02f..49743a1a02f 100644
--- a/ci-expects/radv/traces-radv.yml
+++ b/src/amd/ci/traces-radv.yml
diff --git a/ci-expects/v3d/deqp-v3d-rpi4-fails.txt b/src/broadcom/ci/deqp-v3d-rpi4-fails.txt
index 10ab688613d..10ab688613d 100644
--- a/ci-expects/v3d/deqp-v3d-rpi4-fails.txt
+++ b/src/broadcom/ci/deqp-v3d-rpi4-fails.txt
diff --git a/ci-expects/v3d/deqp-v3d-rpi4-flakes.txt b/src/broadcom/ci/deqp-v3d-rpi4-flakes.txt
index cab00d3bd41..cab00d3bd41 100644
--- a/ci-expects/v3d/deqp-v3d-rpi4-flakes.txt
+++ b/src/broadcom/ci/deqp-v3d-rpi4-flakes.txt
diff --git a/ci-expects/v3dv/deqp-v3dv-rpi4-fails.txt b/src/broadcom/ci/deqp-v3dv-rpi4-fails.txt
index 49799bfbe33..49799bfbe33 100644
--- a/ci-expects/v3dv/deqp-v3dv-rpi4-fails.txt
+++ b/src/broadcom/ci/deqp-v3dv-rpi4-fails.txt
diff --git a/ci-expects/v3dv/deqp-v3dv-rpi4-skips.txt b/src/broadcom/ci/deqp-v3dv-rpi4-skips.txt
index e34a1e5a260..e34a1e5a260 100644
--- a/ci-expects/v3dv/deqp-v3dv-rpi4-skips.txt
+++ b/src/broadcom/ci/deqp-v3dv-rpi4-skips.txt
diff --git a/ci-expects/vc4/deqp-vc4-rpi3-fails.txt b/src/broadcom/ci/deqp-vc4-rpi3-fails.txt
index 49b3e0bfd9a..49b3e0bfd9a 100644
--- a/ci-expects/vc4/deqp-vc4-rpi3-fails.txt
+++ b/src/broadcom/ci/deqp-vc4-rpi3-fails.txt
diff --git a/ci-expects/vc4/deqp-vc4-rpi3-flakes.txt b/src/broadcom/ci/deqp-vc4-rpi3-flakes.txt
index 497be959096..497be959096 100644
--- a/ci-expects/vc4/deqp-vc4-rpi3-flakes.txt
+++ b/src/broadcom/ci/deqp-vc4-rpi3-flakes.txt
diff --git a/ci-expects/vc4/deqp-vc4-rpi3-skips.txt b/src/broadcom/ci/deqp-vc4-rpi3-skips.txt
index 759aaff42ea..759aaff42ea 100644
--- a/ci-expects/vc4/deqp-vc4-rpi3-skips.txt
+++ b/src/broadcom/ci/deqp-vc4-rpi3-skips.txt
diff --git a/ci-expects/freedreno/deqp-freedreno-a307-fails.txt b/src/freedreno/ci/deqp-freedreno-a307-fails.txt
index e1515addd18..e1515addd18 100644
--- a/ci-expects/freedreno/deqp-freedreno-a307-fails.txt
+++ b/src/freedreno/ci/deqp-freedreno-a307-fails.txt
diff --git a/ci-expects/freedreno/deqp-freedreno-a307-flakes.txt b/src/freedreno/ci/deqp-freedreno-a307-flakes.txt
index 4d1a3674f8f..4d1a3674f8f 100644
--- a/ci-expects/freedreno/deqp-freedreno-a307-flakes.txt
+++ b/src/freedreno/ci/deqp-freedreno-a307-flakes.txt
diff --git a/ci-expects/freedreno/deqp-freedreno-a530-fails.txt b/src/freedreno/ci/deqp-freedreno-a530-fails.txt
index a44531b211c..a44531b211c 100644
--- a/ci-expects/freedreno/deqp-freedreno-a530-fails.txt
+++ b/src/freedreno/ci/deqp-freedreno-a530-fails.txt
diff --git a/ci-expects/freedreno/deqp-freedreno-a530-flakes.txt b/src/freedreno/ci/deqp-freedreno-a530-flakes.txt
index 91dfb4c2cae..91dfb4c2cae 100644
--- a/ci-expects/freedreno/deqp-freedreno-a530-flakes.txt
+++ b/src/freedreno/ci/deqp-freedreno-a530-flakes.txt
diff --git a/ci-expects/freedreno/deqp-freedreno-a630-asan-fails.txt b/src/freedreno/ci/deqp-freedreno-a630-asan-fails.txt
index 25d7994d5e5..25d7994d5e5 100644
--- a/ci-expects/freedreno/deqp-freedreno-a630-asan-fails.txt
+++ b/src/freedreno/ci/deqp-freedreno-a630-asan-fails.txt
diff --git a/ci-expects/freedreno/deqp-freedreno-a630-bypass-fails.txt b/src/freedreno/ci/deqp-freedreno-a630-bypass-fails.txt
index 76965a3d99c..76965a3d99c 100644
--- a/ci-expects/freedreno/deqp-freedreno-a630-bypass-fails.txt
+++ b/src/freedreno/ci/deqp-freedreno-a630-bypass-fails.txt
diff --git a/ci-expects/freedreno/deqp-freedreno-a630-bypass-flakes.txt b/src/freedreno/ci/deqp-freedreno-a630-bypass-flakes.txt
index a1d91cdc93a..a1d91cdc93a 100644
--- a/ci-expects/freedreno/deqp-freedreno-a630-bypass-flakes.txt
+++ b/src/freedreno/ci/deqp-freedreno-a630-bypass-flakes.txt
diff --git a/ci-expects/freedreno/deqp-freedreno-a630-fails.txt b/src/freedreno/ci/deqp-freedreno-a630-fails.txt
index f4156ff565c..f4156ff565c 100644
--- a/ci-expects/freedreno/deqp-freedreno-a630-fails.txt
+++ b/src/freedreno/ci/deqp-freedreno-a630-fails.txt
diff --git a/ci-expects/freedreno/deqp-freedreno-a630-flakes.txt b/src/freedreno/ci/deqp-freedreno-a630-flakes.txt
index bd88d6b46ec..bd88d6b46ec 100644
--- a/ci-expects/freedreno/deqp-freedreno-a630-flakes.txt
+++ b/src/freedreno/ci/deqp-freedreno-a630-flakes.txt
diff --git a/ci-expects/freedreno/deqp-freedreno-a630-skips.txt b/src/freedreno/ci/deqp-freedreno-a630-skips.txt
index e3e6299e04c..e3e6299e04c 100644
--- a/ci-expects/freedreno/deqp-freedreno-a630-skips.txt
+++ b/src/freedreno/ci/deqp-freedreno-a630-skips.txt
diff --git a/ci-expects/freedreno/traces-freedreno.yml b/src/freedreno/ci/traces-freedreno.yml
index 605191e19cc..605191e19cc 100644
--- a/ci-expects/freedreno/traces-freedreno.yml
+++ b/src/freedreno/ci/traces-freedreno.yml
diff --git a/ci-expects/llvmpipe/deqp-llvmpipe-fails.txt b/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe-fails.txt
index 34f09b5a9d2..34f09b5a9d2 100644
--- a/ci-expects/llvmpipe/deqp-llvmpipe-fails.txt
+++ b/src/gallium/drivers/llvmpipe/ci/deqp-llvmpipe-fails.txt
diff --git a/ci-expects/lvp/deqp-lvp-fails.txt b/src/gallium/drivers/llvmpipe/ci/deqp-lvp-fails.txt
index 0150b2520b6..0150b2520b6 100644
--- a/ci-expects/lvp/deqp-lvp-fails.txt
+++ b/src/gallium/drivers/llvmpipe/ci/deqp-lvp-fails.txt
diff --git a/ci-expects/lvp/deqp-lvp-flakes.txt b/src/gallium/drivers/llvmpipe/ci/deqp-lvp-flakes.txt
index 08acc89f2c2..08acc89f2c2 100644
--- a/ci-expects/lvp/deqp-lvp-flakes.txt
+++ b/src/gallium/drivers/llvmpipe/ci/deqp-lvp-flakes.txt
diff --git a/ci-expects/lvp/deqp-lvp-skips.txt b/src/gallium/drivers/llvmpipe/ci/deqp-lvp-skips.txt
index 3d15549765c..3d15549765c 100644
--- a/ci-expects/lvp/deqp-lvp-skips.txt
+++ b/src/gallium/drivers/llvmpipe/ci/deqp-lvp-skips.txt
diff --git a/ci-expects/llvmpipe/traces-llvmpipe.yml b/src/gallium/drivers/llvmpipe/ci/traces-llvmpipe.yml
index e2d0e789af9..e2d0e789af9 100644
--- a/ci-expects/llvmpipe/traces-llvmpipe.yml
+++ b/src/gallium/drivers/llvmpipe/ci/traces-llvmpipe.yml
diff --git a/ci-expects/softpipe/deqp-softpipe-asan-fails.txt b/src/gallium/drivers/softpipe/ci/deqp-softpipe-asan-fails.txt
index 2ea7d219b37..2ea7d219b37 100644
--- a/ci-expects/softpipe/deqp-softpipe-asan-fails.txt
+++ b/src/gallium/drivers/softpipe/ci/deqp-softpipe-asan-fails.txt
diff --git a/ci-expects/softpipe/deqp-softpipe-fails.txt b/src/gallium/drivers/softpipe/ci/deqp-softpipe-fails.txt
index a5650f19459..a5650f19459 100644
--- a/ci-expects/softpipe/deqp-softpipe-fails.txt
+++ b/src/gallium/drivers/softpipe/ci/deqp-softpipe-fails.txt
diff --git a/ci-expects/softpipe/deqp-softpipe-flakes.txt b/src/gallium/drivers/softpipe/ci/deqp-softpipe-flakes.txt
index 5d2d50b547c..5d2d50b547c 100644
--- a/ci-expects/softpipe/deqp-softpipe-flakes.txt
+++ b/src/gallium/drivers/softpipe/ci/deqp-softpipe-flakes.txt
diff --git a/ci-expects/softpipe/deqp-softpipe-skips.txt b/src/gallium/drivers/softpipe/ci/deqp-softpipe-skips.txt
index a1345189cdf..a1345189cdf 100644
--- a/ci-expects/softpipe/deqp-softpipe-skips.txt
+++ b/src/gallium/drivers/softpipe/ci/deqp-softpipe-skips.txt
diff --git a/ci-expects/virgl/deqp-virgl-gl-fails.txt b/src/gallium/drivers/virgl/ci/deqp-virgl-gl-fails.txt
index ae85f75519a..ae85f75519a 100644
--- a/ci-expects/virgl/deqp-virgl-gl-fails.txt
+++ b/src/gallium/drivers/virgl/ci/deqp-virgl-gl-fails.txt
diff --git a/ci-expects/virgl/deqp-virgl-gl-skips.txt b/src/gallium/drivers/virgl/ci/deqp-virgl-gl-skips.txt
index 415a8813670..415a8813670 100644
--- a/ci-expects/virgl/deqp-virgl-gl-skips.txt
+++ b/src/gallium/drivers/virgl/ci/deqp-virgl-gl-skips.txt
diff --git a/ci-expects/virgl/deqp-virgl-gles-fails.txt b/src/gallium/drivers/virgl/ci/deqp-virgl-gles-fails.txt
index ddc65681833..ddc65681833 100644
--- a/ci-expects/virgl/deqp-virgl-gles-fails.txt
+++ b/src/gallium/drivers/virgl/ci/deqp-virgl-gles-fails.txt
diff --git a/ci-expects/virgl/traces-virgl.yml b/src/gallium/drivers/virgl/ci/traces-virgl.yml
index 4e27a3c498b..4e27a3c498b 100644
--- a/ci-expects/virgl/traces-virgl.yml
+++ b/src/gallium/drivers/virgl/ci/traces-virgl.yml