X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/6cd7888e46fb7611668c981ff8193c5f3d16d8a6..9a689986c6d416c66195d2a16f54fcb74dc7d805:/runtests.sh diff --git a/runtests.sh b/runtests.sh index 64ba3173..d6a9a482 100755 --- a/runtests.sh +++ b/runtests.sh @@ -111,6 +111,13 @@ # Perhaps we need a common way to cleanup tests. At the moment just # clobbering the directory when we're done should be enough. +# If any of the targets fail, then (GNU?) Make returns 2, instead of +# the return code from the failing command. This is fine, but it +# means that the build farm just shows "2" for failed tests, not the +# number of tests that actually failed. For more details we might +# need to grovel through the log files to find a line saying how many +# failed. + set -e @@ -203,4 +210,11 @@ echo " $passed passed" [ "$missing" -gt 0 ] && echo " $missing missing" echo '------------------------------------------------------------' -exit `expr $failed + $missing` +# OK, so expr exits with 0 if the result is neither null nor zero; and +# 1 if the expression is null or zero. This is the opposite of what +# we want, and if we just call expr then this script will always fail, +# because -e is set. + +result=`expr $failed + $missing || true` +echo "overall result is $result" +exit $result