Fix some shell issues that would occasionally cause hangs if no tests failed.
This commit is contained in:
parent
c569ca15d8
commit
3fe285f8f8
1 changed files with 14 additions and 8 deletions
|
@ -3,9 +3,15 @@ echo ""
|
||||||
|
|
||||||
succeeding="$(find "$@" -size 0)"
|
succeeding="$(find "$@" -size 0)"
|
||||||
notsucceeding="$(find "$@" ! -size 0)"
|
notsucceeding="$(find "$@" ! -size 0)"
|
||||||
skipped="$(grep -l @@SKIPPED $notsucceeding)"
|
if [ "$notsucceeding" != "" ]; then
|
||||||
timedout="$(grep -l @@TIMEDOUT $notsucceeding)"
|
skipped="$(grep -l @@SKIPPED $notsucceeding)"
|
||||||
failed="$(grep -l @@FAIL $notsucceeding)"
|
timedout="$(grep -l @@TIMEDOUT $notsucceeding)"
|
||||||
|
failed="$(grep -l @@FAIL $notsucceeding)"
|
||||||
|
else
|
||||||
|
skipped=
|
||||||
|
timedout=
|
||||||
|
failed=
|
||||||
|
fi
|
||||||
|
|
||||||
for a in $failed $timedout; do
|
for a in $failed $timedout; do
|
||||||
echo "**** $a"
|
echo "**** $a"
|
||||||
|
@ -13,11 +19,11 @@ for a in $failed $timedout; do
|
||||||
echo ""
|
echo ""
|
||||||
done
|
done
|
||||||
|
|
||||||
echo "$(echo $succeeding | wc -w) tests passed"
|
echo "$(echo "$succeeding" | wc -w) tests passed"
|
||||||
echo "$(echo $notsucceeding | wc -w) tests failed to pass"
|
echo "$(echo "$notsucceeding" | wc -w) tests failed to pass"
|
||||||
echo "$(echo $skipped | wc -w) were skipped (see build log for details)"
|
echo "$(echo "$skipped" | wc -w) were skipped (see build log for details)"
|
||||||
echo "$(echo $timedout | wc -w) timed out"
|
echo "$(echo "$timedout" | wc -w) timed out"
|
||||||
echo "$(echo $failed | wc -w) failed"
|
echo "$(echo "$failed" | wc -w) failed"
|
||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
if [ "$failed" != "" -o "$timedout" != "" ]; then
|
if [ "$failed" != "" -o "$timedout" != "" ]; then
|
||||||
|
|
Loading…
Reference in a new issue