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 <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19912>
This commit is contained in:
Emma Anholt
2022-11-17 16:43:33 -08:00
committed by Marge Bot
parent ac2b84b8c2
commit eb699d8014
3 changed files with 12 additions and 29 deletions

View File

@@ -1,26 +0,0 @@
#!/bin/sh
# This test script groups together a bunch of fast dEQP variant runs
# to amortize the cost of rebooting the board.
set -ex
EXIT=0
# Run reset tests without parallelism:
if ! env \
DEQP_RESULTS_DIR=results/reset \
FDO_CI_CONCURRENT=1 \
DEQP_CASELIST_FILTER='.*reset.*' \
/install/deqp-runner.sh; then
EXIT=1
fi
# Then run everything else with parallelism:
if ! env \
DEQP_RESULTS_DIR=results/nonrobustness \
DEQP_CASELIST_INV_FILTER='.*reset.*' \
/install/deqp-runner.sh; then
EXIT=1
fi

View File

@@ -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",
]

View File

@@ -196,8 +196,7 @@ a630_gl:
variables: variables:
DEQP_SUITE: freedreno-a630 DEQP_SUITE: freedreno-a630
# Robustness tests may be disruptive to other tests, so we run EGL's robustness # Run dEQP EGL window system tests separately with the window systems available.
# tests separately.
a630_egl: a630_egl:
extends: extends:
- .baremetal-deqp-test - .baremetal-deqp-test
@@ -205,7 +204,7 @@ a630_egl:
variables: variables:
DEQP_VER: egl DEQP_VER: egl
HWCI_START_XORG: 1 HWCI_START_XORG: 1
HWCI_TEST_SCRIPT: "/install/bare-metal/arm64_a630_egl.sh" DEQP_SUITE: freedreno-a630-egl
a630_gles_asan: a630_gles_asan:
extends: extends: