test: Fix parsing of piglit results

The "dmesg-fail" line was matching our "fail" regex, so if you didn't
have those we would ignore fails.

Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Eric Anholt 2016-09-25 13:30:19 -07:00 committed by Adam Jackson
parent 7fe5b9c02c
commit 022fea767c

View File

@ -55,14 +55,14 @@ cat $SHORT_SUMMARY
# Parse the piglit summary to decide on our exit status. # Parse the piglit summary to decide on our exit status.
status=0 status=0
# "pass: 0" would mean no tests actually ran. # "pass: 0" would mean no tests actually ran.
if grep "pass:.*0" $SHORT_SUMMARY > /dev/null; then if grep "^ *pass: *0$" $SHORT_SUMMARY > /dev/null; then
status=1 status=1
fi fi
# Fails or crashes should be failures from make check's perspective. # Fails or crashes should be failures from make check's perspective.
if ! grep "fail:.*0" $SHORT_SUMMARY > /dev/null; then if ! grep "^ *fail: *0$" $SHORT_SUMMARY > /dev/null; then
status=1 status=1
fi fi
if ! grep "crash:.*0" $SHORT_SUMMARY > /dev/null; then if ! grep "^ *crash: *0$" $SHORT_SUMMARY > /dev/null; then
status=1 status=1
fi fi