From 3aa048728983a33c4cc46871c093d6276af87d8d Mon Sep 17 00:00:00 2001 From: David Given Date: Fri, 2 Dec 2016 00:10:33 +0100 Subject: [PATCH] UI tweaks to the test summary. --- first/testsummary.sh | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/first/testsummary.sh b/first/testsummary.sh index be0842afa..9f1002b39 100755 --- a/first/testsummary.sh +++ b/first/testsummary.sh @@ -1,21 +1,33 @@ #!/bin/sh -notsucceeding=$(find "$@" ! -size 0) echo "" -echo "$(echo $notsucceeding | wc -w) tests failed to pass" -skipped=$(grep -l @@SKIPPED $notsucceeding) -echo "$(echo $skipped | wc -w) were skipped (see build log for details)" +succeeding="$(find "$@" -size 0)" +notsucceeding="$(find "$@" ! -size 0)" +skipped="$(grep -l @@SKIPPED $notsucceeding)" +timedout="$(grep -l @@TIMEDOUT $notsucceeding)" +failed="$(grep -l @@FAIL $notsucceeding)" -timedout=$(grep -l @@TIMEDOUT $notsucceeding) -echo "$(echo $timedout | wc -w) timed out" - -failed=$(grep -l @@FAIL $notsucceeding) -echo "$(echo $failed | wc -w) failed" - -echo "" for a in $failed $timedout; do echo "**** $a" cat $a echo "" done -exec test "$failed" == "" -o "$timedout" == "" + +echo "$(echo $succeeding | wc -w) tests passed" +echo "$(echo $notsucceeding | wc -w) tests failed to pass" +echo "$(echo $skipped | wc -w) were skipped (see build log for details)" +echo "$(echo $timedout | wc -w) timed out" +echo "$(echo $failed | wc -w) failed" +echo "" + +if [ "$failed" != "" -o "$timedout" != "" ]; then + echo "Test status: SAD FACE (tests are failing)" + exit 1 +fi +if [ "$succeeding" = "" ]; then + echo "Test status: PUZZLED FACE (all tests were skipped)" + exit 1 +fi +echo "Test status: HAPPY FACE (all tests are passing)" +exit 0 +