diff options
| author | Emma Anholt <emma@anholt.net> | 2021-06-11 14:03:37 -0700 |
|---|---|---|
| committer | Emma Anholt <emma@anholt.net> | 2021-06-14 12:09:19 -0700 |
| commit | 9cc1f089196f2f5c695dbf5f42b947b9970b8965 (patch) | |
| tree | 328b6d6a2e02df7749ce38075c719d887cb38d71 /.gitlab-ci | |
| parent | e8ca9b99cb0d70e270b6712c19d8f321b0b9762e (diff) | |
ci/deqp: Skip flush_finish on all CI jobs.
They're too slow to run in CI even on non-tiled renderers, they don't
block conformance (unless you crash), and provide unreliable warning
results unless you isolate them from other activity on the system.
This means that the following jobs now skip these tests:
- deqp-iris-*
- deqp-llvmpipe (you know, the one mentioned in the comment!)
- deqp-virgl-gl
- deqp-zink-lvp
Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11333>
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/deqp-all-skips.txt (renamed from .gitlab-ci/deqp-default-skips.txt) | 3 | ||||
| -rwxr-xr-x | .gitlab-ci/deqp-runner.sh | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.gitlab-ci/deqp-default-skips.txt b/.gitlab-ci/deqp-all-skips.txt index de86b640c48..c4d71cb5178 100644 --- a/.gitlab-ci/deqp-default-skips.txt +++ b/.gitlab-ci/deqp-all-skips.txt @@ -2,5 +2,6 @@ # non-zero-length and not starting with '#', will regex match to # delete lines from the test list. Be careful. -# These are really slow on tiling architectures (including llvmpipe). +# These are tremendously slow (pushing toward a minute), and aren't +# reliable to be run in parallel with other tests due to CPU-side timing. dEQP-GLES[0-9]*.functional.flush_finish.* diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh index 98c6e1d5f12..b3d0bd93953 100755 --- a/.gitlab-ci/deqp-runner.sh +++ b/.gitlab-ci/deqp-runner.sh @@ -98,9 +98,7 @@ fi touch $INSTALL/deqp-$GPU_VERSION-flakes.txt if [ -e "$INSTALL/deqp-$GPU_VERSION-skips.txt" ]; then - DEQP_RUNNER_OPTIONS="$DEQP_RUNNER_OPTIONS --skips $INSTALL/deqp-$GPU_VERSION-skips.txt" -else - DEQP_RUNNER_OPTIONS="$DEQP_RUNNER_OPTIONS --skips $INSTALL/deqp-default-skips.txt" + DEQP_SKIPS="$INSTALL/deqp-$GPU_VERSION-skips.txt" fi set +e @@ -127,6 +125,7 @@ run_cts() { --deqp $deqp \ --output $RESULTS \ --caselist $caselist \ + --skips $INSTALL/deqp-all-skips.txt $DEQP_SKIPS \ --flakes $INSTALL/deqp-$GPU_VERSION-flakes.txt \ --testlog-to-xml /deqp/executor/testlog-to-xml \ $JOB \ |