Fix comment.

[rsync/rsync.git] / runtests.sh

diff --git a/runtests.sh b/runtests.sh
index 55c6149..59a34fa 100755 (executable)
--- a/runtests.sh
+++ b/runtests.sh
@@ -3,8 +3,8 @@
 # Copyright (C) 2001 by Martin Pool <mbp@samba.org>
 
 # This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version
-# 2.1 as published by the Free Software Foundation.
+# it under the terms of the GNU General Public License version
+# 2 as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -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
 
@@ -101,8 +104,11 @@ RUNSHFLAGS='-e'
 
 if [ -n "$loglevel" ] && [ "$loglevel" -gt 8 ]
 then
-    RUNSHFLAGS="$RUNSHFLAGS -x"
-    set -x
+    if set -x
+    then
+       # If it doesn't work the first time, don't keep trying.
+       RUNSHFLAGS="$RUNSHFLAGS -x"
+    fi
 fi
 
 echo "============================================================"
@@ -110,13 +116,13 @@ echo "$0 running in `pwd`"
 echo "    rsync_bin=$rsync_bin"
 echo "    srcdir=$srcdir"
 
-if ! test -f $rsync_bin
+if test ! -f $rsync_bin
 then
     echo "rsync_bin $rsync_bin is not a file" >&2
     exit 2
 fi
 
-if ! test -d $srcdir
+if test ! -d $srcdir
 then
     echo "srcdir $srcdir is not a directory" >&2
     exit 2
@@ -141,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"
 
@@ -166,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
@@ -174,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`