From 022fea767cd29d256fb99159df89cc25d339e787 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Sun, 25 Sep 2016 13:30:19 -0700 Subject: [PATCH] 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 Signed-off-by: Eric Anholt --- test/scripts/run-piglit.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/scripts/run-piglit.sh b/test/scripts/run-piglit.sh index 11e9c1eb9..c412d7ee7 100755 --- a/test/scripts/run-piglit.sh +++ b/test/scripts/run-piglit.sh @@ -55,14 +55,14 @@ cat $SHORT_SUMMARY # Parse the piglit summary to decide on our exit status. status=0 # "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 fi # 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 fi -if ! grep "crash:.*0" $SHORT_SUMMARY > /dev/null; then +if ! grep "^ *crash: *0$" $SHORT_SUMMARY > /dev/null; then status=1 fi