ci/piglit: Stop including the test counts at the end of expectations.

It's just a ton of fuss for driver developers fixing piglit tests.  This
makes the trace expectation files pretty silly (empty expectation, but
you'll get a diff to a non-empty result when something fails)

Acked-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Acked-by: Adam Jackson <ajax@redhat.com>
Acked-by: Andres Gomez <agomez@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9226>
This commit is contained in:
Eric Anholt 2021-02-22 17:21:13 -08:00 committed by Marge Bot
parent 1121ea8192
commit bcea453d4a
24 changed files with 8 additions and 354 deletions

View File

@ -230,7 +230,9 @@ RESULTSFILE="$RESULTS/$PIGLIT_RESULTS.txt"
mkdir -p .gitlab-ci/piglit
./piglit summary console "$RESULTS"/results.json.bz2 \
| tee ".gitlab-ci/piglit/$PIGLIT_RESULTS.txt.orig" \
| head -n -1 | grep -v ": pass" > $RESULTSFILE
| head -n -1 | grep -v ": pass" \
| sed '/^summary:/Q' \
> $RESULTSFILE
if [ "x$PIGLIT_PROFILES" = "xreplay" ] \
&& [ ${PIGLIT_REPLAY_UPLOAD_TO_MINIO:-0} -eq 1 ]; then

View File

@ -43,7 +43,11 @@ set -e
PIGLIT_RESULTS=${PIGLIT_RESULTS:-$PIGLIT_PROFILES}
mkdir -p .gitlab-ci/piglit
./piglit summary console $OLDPWD/results | head -n -1 | grep -v ": pass" > .gitlab-ci/piglit/$PIGLIT_RESULTS.txt
./piglit summary console $OLDPWD/results \
| head -n -1 \
| grep -v ": pass" \
| sed '/^summary:/Q' \
> .gitlab-ci/piglit/$PIGLIT_RESULTS.txt
if [ -n "$USE_CASELIST" ]; then
# Just filter the expected results based on the tests that were actually

View File

@ -1,16 +0,0 @@
summary:
name: results
---- --------
pass: 3
fail: 0
crash: 0
skip: 0
timeout: 0
warn: 0
incomplete: 0
dmesg-warn: 0
dmesg-fail: 0
changes: 0
fixes: 0
regressions: 0
total: 3

View File

@ -1,16 +0,0 @@
summary:
name: results
---- --------
pass: 3
fail: 0
crash: 0
skip: 0
timeout: 0
warn: 0
incomplete: 0
dmesg-warn: 0
dmesg-fail: 0
changes: 0
fixes: 0
regressions: 0
total: 3

View File

@ -5579,19 +5579,3 @@ spec/oes_viewport_array/viewport-indices: skip
wgl/wgl-multi-context-single-window: skip
wgl/wgl-multi-window-single-context: skip
wgl/wgl-sanity: skip
summary:
name: results
---- --------
pass: 10968
fail: 216
crash: 6
skip: 5336
timeout: 0
warn: 0
incomplete: 0
dmesg-warn: 0
dmesg-fail: 0
changes: 0
fixes: 0
regressions: 0
total: 16549

View File

@ -3156,19 +3156,3 @@ spec/nv_viewport_swizzle/viewport_swizzle: skip
spec/oes_viewport_array/viewport-gs-write-simple: skip
spec/oes_viewport_array/viewport-gs-writes-in-range: skip
spec/oes_viewport_array/viewport-gs-writes-out-of-range: skip
summary:
name: results
---- --------
pass: 3354
fail: 2
crash: 1
skip: 3155
timeout: 0
warn: 0
incomplete: 0
dmesg-warn: 0
dmesg-fail: 0
changes: 0
fixes: 0
regressions: 0
total: 6512

View File

@ -5571,19 +5571,3 @@ spec/oes_viewport_array/viewport-indices: skip
wgl/wgl-multi-context-single-window: skip
wgl/wgl-multi-window-single-context: skip
wgl/wgl-sanity: skip
summary:
name: results
---- --------
pass: 2198
fail: 294
crash: 50
skip: 5182
timeout: 0
warn: 1
incomplete: 2
dmesg-warn: 0
dmesg-fail: 0
changes: 0
fixes: 0
regressions: 0
total: 7771

View File

@ -3352,19 +3352,3 @@ spec/oes_geometry_shader/sso_validation/user-defined-gs-input-not-in-block: skip
spec/oes_viewport_array/viewport-gs-write-simple: skip
spec/oes_viewport_array/viewport-gs-writes-in-range: skip
spec/oes_viewport_array/viewport-gs-writes-out-of-range: skip
summary:
name: results
---- --------
pass: 3153
fail: 75
crash: 1
skip: 3278
timeout: 0
warn: 0
incomplete: 0
dmesg-warn: 0
dmesg-fail: 0
changes: 0
fixes: 0
regressions: 0
total: 6507

View File

@ -2016,19 +2016,3 @@ spec/oes_viewport_array/viewport-indices: skip
wgl/wgl-multi-context-single-window: skip
wgl/wgl-multi-window-single-context: skip
wgl/wgl-sanity: skip
summary:
name: results
---- --------
pass: 16550
fail: 510
crash: 26
skip: 1439
timeout: 0
warn: 0
incomplete: 0
dmesg-warn: 0
dmesg-fail: 0
changes: 0
fixes: 0
regressions: 0
total: 18568

View File

@ -1202,19 +1202,3 @@ spec/oes_geometry_shader/sso_validation/user-defined-gs-input-not-in-block: skip
spec/oes_viewport_array/viewport-gs-write-simple: skip
spec/oes_viewport_array/viewport-gs-writes-in-range: skip
spec/oes_viewport_array/viewport-gs-writes-out-of-range: skip
summary:
name: results
---- --------
pass: 5338
fail: 71
crash: 35
skip: 1096
timeout: 0
warn: 2
incomplete: 0
dmesg-warn: 0
dmesg-fail: 0
changes: 0
fixes: 0
regressions: 0
total: 6542

View File

@ -4759,19 +4759,3 @@ spec/oes_viewport_array/viewport-indices: skip
wgl/wgl-multi-context-single-window: skip
wgl/wgl-multi-window-single-context: skip
wgl/wgl-sanity: skip
summary:
name: results
---- --------
pass: 16808
fail: 1616
crash: 175
skip: 2758
timeout: 0
warn: 116
incomplete: 0
dmesg-warn: 0
dmesg-fail: 0
changes: 0
fixes: 0
regressions: 0
total: 21593

View File

@ -1,16 +0,0 @@
summary:
name: results
---- --------
pass: 55
fail: 0
crash: 0
skip: 0
timeout: 0
warn: 0
incomplete: 0
dmesg-warn: 0
dmesg-fail: 0
changes: 0
fixes: 0
regressions: 0
total: 55

View File

@ -1122,19 +1122,3 @@ spec/nv_viewport_swizzle/viewport_swizzle: skip
spec/oes_viewport_array/viewport-gs-write-simple: skip
spec/oes_viewport_array/viewport-gs-writes-in-range: skip
spec/oes_viewport_array/viewport-gs-writes-out-of-range: skip
summary:
name: results
---- --------
pass: 8880
fail: 29
crash: 95
skip: 998
timeout: 0
warn: 2
incomplete: 0
dmesg-warn: 0
dmesg-fail: 0
changes: 0
fixes: 0
regressions: 0
total: 10004

View File

@ -94,19 +94,3 @@ program/execute/vload/vload-half-private: skip
program/execute/vstore/vstore-half-global: skip
program/execute/vstore/vstore-half-local: skip
program/execute/vstore/vstore-half-private: skip
summary:
name: results
---- --------
pass: 3766
fail: 14
crash: 5
skip: 73
timeout: 4
warn: 0
incomplete: 0
dmesg-warn: 0
dmesg-fail: 0
changes: 0
fixes: 0
regressions: 0
total: 3862

View File

@ -2599,19 +2599,3 @@ spec/oes_texture_storage_multisample_2d_array/preprocessor/disabled-undefined-es
spec/oes_texture_storage_multisample_2d_array/preprocessor/disabled-undefined-es.tesc: skip
spec/oes_texture_storage_multisample_2d_array/preprocessor/disabled-undefined-es.tese: skip
spec/oes_texture_storage_multisample_2d_array/preprocessor/disabled-undefined-es.vert: skip
summary:
name: results
---- --------
pass: 12265
fail: 4
crash: 4
skip: 2593
timeout: 0
warn: 0
incomplete: 0
dmesg-warn: 0
dmesg-fail: 0
changes: 0
fixes: 0
regressions: 0
total: 14866

View File

@ -1646,19 +1646,3 @@ spec/oes_texture_view/texsubimage-levels pbo: skip
wgl/wgl-multi-context-single-window: skip
wgl/wgl-multi-window-single-context: skip
wgl/wgl-sanity: skip
summary:
name: results
---- --------
pass: 23158
fail: 189
crash: 1
skip: 1434
timeout: 0
warn: 6
incomplete: 0
dmesg-warn: 0
dmesg-fail: 0
changes: 0
fixes: 0
regressions: 0
total: 24806

View File

@ -509,19 +509,3 @@ spec/nv_viewport_array2/execution/viewport_non_relative_broadcast: skip
spec/nv_viewport_array2/execution/viewport_relative_broadcast: skip
spec/nv_viewport_array2/linker/mismatched_viewport_relative: skip
spec/nv_viewport_swizzle/viewport_swizzle: skip
summary:
name: results
---- --------
pass: 15912
fail: 82
crash: 170
skip: 259
timeout: 0
warn: 0
incomplete: 0
dmesg-warn: 0
dmesg-fail: 0
changes: 0
fixes: 0
regressions: 0
total: 16423

View File

@ -1,16 +0,0 @@
summary:
name: results
---- --------
pass: 43
fail: 0
crash: 0
skip: 0
timeout: 0
warn: 0
incomplete: 0
dmesg-warn: 0
dmesg-fail: 0
changes: 0
fixes: 0
regressions: 0
total: 43

View File

@ -1,16 +0,0 @@
summary:
name: results
---- --------
pass: 8
fail: 0
crash: 0
skip: 0
timeout: 0
warn: 0
incomplete: 0
dmesg-warn: 0
dmesg-fail: 0
changes: 0
fixes: 0
regressions: 0
total: 8

View File

@ -1,16 +0,0 @@
summary:
name: results
---- --------
pass: 48
fail: 0
crash: 0
skip: 0
timeout: 0
warn: 0
incomplete: 0
dmesg-warn: 0
dmesg-fail: 0
changes: 0
fixes: 0
regressions: 0
total: 48

View File

@ -1,16 +0,0 @@
summary:
name: results
---- --------
pass: 58
fail: 0
crash: 0
skip: 0
timeout: 0
warn: 0
incomplete: 0
dmesg-warn: 0
dmesg-fail: 0
changes: 0
fixes: 0
regressions: 0
total: 58

View File

@ -3055,19 +3055,3 @@ spec/oes_texture_view/texsubimage-levels pbo: skip
wgl/wgl-multi-context-single-window: skip
wgl/wgl-multi-window-single-context: skip
wgl/wgl-sanity: skip
summary:
name: results
---- --------
pass: 26873
fail: 404
crash: 31
skip: 2593
timeout: 0
warn: 4
incomplete: 0
dmesg-warn: 0
dmesg-fail: 0
changes: 0
fixes: 0
regressions: 0
total: 29930

View File

@ -1,16 +0,0 @@
summary:
name: results
---- --------
pass: 7
fail: 0
crash: 0
skip: 0
timeout: 0
warn: 0
incomplete: 0
dmesg-warn: 0
dmesg-fail: 0
changes: 0
fixes: 0
regressions: 0
total: 7

View File

@ -3019,19 +3019,3 @@ spec/oes_viewport_array/viewport-indices: skip
wgl/wgl-multi-context-single-window: skip
wgl/wgl-multi-window-single-context: skip
wgl/wgl-sanity: skip
summary:
name: results
---- --------
pass: 18674
fail: 1290
crash: 13
skip: 1691
timeout: 0
warn: 4
incomplete: 0
dmesg-warn: 0
dmesg-fail: 0
changes: 0
fixes: 0
regressions: 0
total: 21695