diff options
| author | Samuel Pitoiset <samuel.pitoiset@gmail.com> | 2020-04-30 11:40:42 +0200 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2020-05-05 18:56:45 +0200 |
| commit | e2037aea0c97b9b940261b70a4d254188f288b07 (patch) | |
| tree | c008ba94b975b9d70e1f84bd19c10e8669fcccd7 | |
| parent | 725f45bc63a7f95672b3bd83e435c6a95c1edd28 (diff) | |
ci: fix reporting the number of unexpected/flakes
`wc -l $file` returns the number of lines and the filename.
Fixes: b8c66aeb934 ("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 cc2c3b41b86d1dd8d23685c34be030f2607ed11d)
| -rwxr-xr-x | .gitlab-ci/deqp-runner.sh | 4 | ||||
| -rw-r--r-- | .pick_status.json | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh index d4de8f74baf..48d95b2bedd 100755 --- a/.gitlab-ci/deqp-runner.sh +++ b/.gitlab-ci/deqp-runner.sh @@ -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 diff --git a/.pick_status.json b/.pick_status.json index de218564fd0..695ec28b3fb 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -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" }, |