X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/5cb1f5c7950771429df39ee829b4744749132930..740819ef7b3b96451e16b2fa3891d46cfc73ec64:/runtests.sh

diff --git a/runtests.sh b/runtests.sh
index 1d284372..d6a9a482 100755
--- 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,32 @@
 # 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.
+
+# BSD machines tend not to have "head" or "seq".
+
+# You cannot do "export VAR=VALUE" all on one line; the export must be
+# separate from the assignment.  (SCO SysV)
+
+
+
+# STILL TO DO:
+
+# We need a good protection against tests that hang indefinitely.
+# Perhaps some combination of starting them in the background, wait,
+# and kill?
+
+# 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
 
@@ -101,8 +127,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 "============================================================"
@@ -141,15 +170,14 @@ suitedir="$srcdir/testsuite"
 
 export scratchdir suitedir
 
-for testbase in rsync-hello hands ssh-basic
+if [ "x$whichtests" = x ]
+then
+    whichtests="*.test"
+fi
+
+for testscript in $suitedir/$whichtests
 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 +194,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 +205,16 @@ 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`
+# 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