X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/42e66aa24cacea99d62b203d1c1a4bad234a1f1a..ec99e9da819e00f76ae25fb0a4acb7306c6b7e5d:/runtests.sh diff --git a/runtests.sh b/runtests.sh index 712bde84..7cf018e2 100755 --- a/runtests.sh +++ b/runtests.sh @@ -92,6 +92,9 @@ # they're in POSIX 1003.2, and since the build farm relies on them # they're probably working on most machines we really care about. +# You cannot use "function foo {" syntax, but must instead say "foo() +# {", or it breaks on FreeBSD. + set -e @@ -144,15 +147,9 @@ suitedir="$srcdir/testsuite" export scratchdir suitedir -for testbase in rsync-hello hands ssh-basic +for testscript in $suitedir/*.test do - testscript="$suitedir/$testbase.test" - if test \! -f "$testscript" - then - echo "$testscript does not exist" >&2 - missing=`expr $missing + 1` - continue - fi + testbase=`echo $testscript | sed 's!.*/!!'` echo "----- $testbase starting" @@ -169,7 +166,10 @@ do *) echo "----- $testbase failed!" failed=`expr $failed + 1` - [ "$nopersist" = "yes" ] && exit 1 + if [ "x$nopersist" = "xyes" ] + then + exit 1 + fi esac fi done @@ -177,9 +177,9 @@ done echo '------------------------------------------------------------' echo "----- overall results:" echo " $passed passed" -echo " $failed failed" -echo " $skipped skipped" -echo " $missing missing" +[ "$failed" -gt 0 ] && echo " $failed failed" +[ "$skipped" -gt 0 ] && echo " $skipped skipped" +[ "$missing" -gt 0 ] && echo " $missing missing" echo '------------------------------------------------------------' exit `expr $failed + $missing`