ci/freedreno: Stop segregating reset tests from non-reset tests in EGL.

Now that we assign reset blame appropriately, they're safe to run together, and no single-threading. I put these in a .toml because I'm about to add another window system. Acked-by: David Heidelberg <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19912>
SolDev69 · Nov 22, 2022 · eb699d8 · eb699d8
1 parent ac2b84b
commit eb699d8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 29 deletions.
diff --git a/.gitlab-ci/bare-metal/arm64_a630_egl.sh b/.gitlab-ci/bare-metal/arm64_a630_egl.sh
diff --git a/src/freedreno/ci/deqp-freedreno-a630-egl.toml b/src/freedreno/ci/deqp-freedreno-a630-egl.toml
@@ -0,0 +1,10 @@
+# x11
+[[deqp]]
+deqp = "/deqp/modules/egl/deqp-egl"
+caselists = ["/deqp/mustpass/egl-master.txt"]
+skips = ["install/freedreno-a630-premerge-skips.txt"]
+deqp_args = [
+    "--deqp-surface-width=256", "--deqp-surface-height=256",
+    "--deqp-surface-type=pbuffer", "--deqp-visibility=hidden",
+    "--deqp-gl-config-name=rgba8888d24s8ms0",
+]
diff --git a/src/freedreno/ci/gitlab-ci.yml b/src/freedreno/ci/gitlab-ci.yml
@@ -196,16 +196,15 @@ a630_gl:
   variables:
     DEQP_SUITE: freedreno-a630
 
-# Robustness tests may be disruptive to other tests, so we run EGL's robustness
-# tests separately.
+# Run dEQP EGL window system tests separately with the window systems available.
 a630_egl:
   extends:
     - .baremetal-deqp-test
     - .a630-test
   variables:
     DEQP_VER: egl
     HWCI_START_XORG: 1
-    HWCI_TEST_SCRIPT: "/install/bare-metal/arm64_a630_egl.sh"
+    DEQP_SUITE: freedreno-a630-egl
 
 a630_gles_asan:
   extends: