ci: fix reporting the number of unexpected/flakes

`wc -l $file` returns the number of lines and the filename.

Fixes: b8c66aeb93 ("ci: Clean up some excessive use of pipes in dEQP results processing.")
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Andres Gomez <agomez@igalia.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4829>
(cherry picked from commit cc2c3b41b8)
This commit is contained in:
Samuel Pitoiset 2020-04-30 11:40:42 +02:00 committed by Eric Engestrom
parent 725f45bc63
commit e2037aea0c
2 changed files with 3 additions and 3 deletions

View File

@ -259,7 +259,7 @@ if [ $DEQP_EXITCODE -ne 0 ]; then
cat $UNEXPECTED_RESULTSFILE.txt
fi
count=`wc -l $UNEXPECTED_RESULTSFILE.txt`
count=`cat $UNEXPECTED_RESULTSFILE.txt | wc -l`
# Re-run fails to detect flakes. But use a small threshold, if
# something was fundamentally broken, we don't want to re-run
@ -267,7 +267,7 @@ if [ $DEQP_EXITCODE -ne 0 ]; then
else
grep ",Flake" $RESULTSFILE > $FLAKESFILE
count=`wc -l $FLAKESFILE`
count=`cat $FLAKESFILE | wc -l`
if [ $count -gt 0 ]; then
echo "Some flakes found (see cts-runner-flakes.txt in artifacts for full results):"
head -n 50 $FLAKESFILE

View File

@ -697,7 +697,7 @@
"description": "ci: fix reporting the number of unexpected/flakes",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "b8c66aeb9341d695c79a2d69935016919c42f843"
},