fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 22:00:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ci: Clean up some excessive use of pipes in dEQP results processing.

Browse source 
Given that we use set -x in the script, this actually makes the user
experience of viewing logs nicer.

Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4621>
This commit is contained in:
Eric Anholt 2020-04-17 13:01:50 -07:00 • committed by Marge Bot
parent 951e101fec
commit b8c66aeb93
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
.gitlab-ci/deqp-runner.sh
View file

@ -242,11 +242,7 @@ DEQP_EXITCODE=$?
if [ $DEQP_EXITCODE -ne 0 ]; then if [ $DEQP_EXITCODE -ne 0 ]; then
# preserve caselist files in case of failures: # preserve caselist files in case of failures:
cp /tmp/deqp_runner.*.txt $RESULTS/ cp /tmp/deqp_runner.*.txt $RESULTS/
cat $RESULTSFILE | \ egrep -v ",Pass|,Skip|,ExpectedFail" $RESULTSFILE > $UNEXPECTED_RESULTSFILE.txt
grep -v ",Pass" | \
grep -v ",Skip" | \
grep -v ",ExpectedFail" > \
$UNEXPECTED_RESULTSFILE.txt
if [ -z "$DEQP_NO_SAVE_RESULTS" ]; then if [ -z "$DEQP_NO_SAVE_RESULTS" ]; then
echo "Some unexpected results found (see cts-runner-results.txt in artifacts for full results):" echo "Some unexpected results found (see cts-runner-results.txt in artifacts for full results):"
@ -259,17 +255,15 @@ if [ $DEQP_EXITCODE -ne 0 ]; then
cat $UNEXPECTED_RESULTSFILE.txt cat $UNEXPECTED_RESULTSFILE.txt
fi fi
count=`cat $UNEXPECTED_RESULTSFILE.txt | wc -l` count=`wc -l $UNEXPECTED_RESULTSFILE.txt`
# Re-run fails to detect flakes. But use a small threshold, if # Re-run fails to detect flakes. But use a small threshold, if
# something was fundamentally broken, we don't want to re-run # something was fundamentally broken, we don't want to re-run
# the entire caselist # the entire caselist
else else
cat $RESULTSFILE | \ grep ",Flake" $RESULTSFILE > $FLAKESFILE
grep ",Flake" > \
$FLAKESFILE
count=`cat $FLAKESFILE | wc -l` count=`wc -l $FLAKESFILE`
if [ $count -gt 0 ]; then if [ $count -gt 0 ]; then
echo "Some flakes found (see cts-runner-flakes.txt in artifacts for full results):" echo "Some flakes found (see cts-runner-flakes.txt in artifacts for full results):"
head -n 50 $FLAKESFILE head -n 50 $FLAKESFILE