Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean up output a little.
[rsync/rsync.git]
/
runtests.sh
diff --git
a/runtests.sh
b/runtests.sh
index
1026d05
..
7cf018e
100755
(executable)
--- a/
runtests.sh
+++ b/
runtests.sh
@@
-62,13
+62,17
@@
# Each test case runs in its own shell.
# Each test case runs in its own shell.
-# Exit codes
: (passed back to build farm)
:
+# Exit codes
from tests
:
# 1 tests failed
# 2 error in starting tests
# 77 this test skipped (random value unlikely to happen by chance, same as
# automake)
# 1 tests failed
# 2 error in starting tests
# 77 this test skipped (random value unlikely to happen by chance, same as
# automake)
+# HOWEVER, the overall exit code to the farm is different: we return
+# the *number of tests that failed*, so that it will show up nicely in
+# the overall summary.
+
# rsync.fns contains some general setup functions and definitions.
# rsync.fns contains some general setup functions and definitions.
@@
-88,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.
# 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
set -e
@@
-97,8
+104,11
@@
RUNSHFLAGS='-e'
if [ -n "$loglevel" ] && [ "$loglevel" -gt 8 ]
then
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 "============================================================"
fi
echo "============================================================"
@@
-106,20
+116,21
@@
echo "$0 running in `pwd`"
echo " rsync_bin=$rsync_bin"
echo " srcdir=$srcdir"
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
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
fi
then
echo "srcdir $srcdir is not a directory" >&2
exit 2
fi
+RSYNC="$rsync_bin"
-export rsync_bin
+export rsync_bin
RSYNC
skipped=0
missing=0
skipped=0
missing=0
@@
-129,24
+140,18
@@
failed=0
scratchdir=./testtmp
[ -d "$scratchdir" ] && rm -r "$scratchdir"
mkdir "$scratchdir"
scratchdir=./testtmp
[ -d "$scratchdir" ] && rm -r "$scratchdir"
mkdir "$scratchdir"
-
+scratchdir=`cd $scratchdir && pwd`
echo " scratchdir=$scratchdir"
echo " scratchdir=$scratchdir"
+
suitedir="$srcdir/testsuite"
export scratchdir suitedir
suitedir="$srcdir/testsuite"
export scratchdir suitedir
-for test
base in rsync-hello hands ssh-basic
+for test
script in $suitedir/*.test
do
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 "------------------------------------------------------------"
- echo "----- $testbase running"
+ echo "----- $testbase starting"
if sh $RUNSHFLAGS "$testscript"
then
if sh $RUNSHFLAGS "$testscript"
then
@@
-161,6
+166,10
@@
do
*)
echo "----- $testbase failed!"
failed=`expr $failed + 1`
*)
echo "----- $testbase failed!"
failed=`expr $failed + 1`
+ if [ "x$nopersist" = "xyes" ]
+ then
+ exit 1
+ fi
esac
fi
done
esac
fi
done
@@
-168,14
+177,9
@@
done
echo '------------------------------------------------------------'
echo "----- overall results:"
echo " $passed passed"
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 '------------------------------------------------------------'
echo '------------------------------------------------------------'
-if test "$failed" -gt 0 || test "$missing" -gt 0
-then
- exit 1
-else
- exit 0
-fi
+exit `expr $failed + $missing`