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
A few improvements to the "test" commands to neaten them up and
[rsync/rsync.git]
/
runtests.sh
diff --git
a/runtests.sh
b/runtests.sh
index
31c4936
..
85030d0
100755
(executable)
--- a/
runtests.sh
+++ b/
runtests.sh
@@
-126,12
+126,10
@@
set -e
RUNSHFLAGS='-e'
# for Solaris
RUNSHFLAGS='-e'
# for Solaris
-PATH="/usr/xpg4/bin/:$PATH"
+
[ -d /usr/xpg4/bin ] &&
PATH="/usr/xpg4/bin/:$PATH"
-if [ -n "$loglevel" ] && [ "$loglevel" -gt 8 ]
-then
- if set -x
- then
+if [ "x$loglevel" != x ] && [ "$loglevel" -gt 8 ]; then
+ if set -x; then
# If it doesn't work the first time, don't keep trying.
RUNSHFLAGS="$RUNSHFLAGS -x"
fi
# If it doesn't work the first time, don't keep trying.
RUNSHFLAGS="$RUNSHFLAGS -x"
fi
@@
-142,24
+140,37
@@
echo "$0 running in `pwd`"
echo " rsync_bin=$rsync_bin"
echo " srcdir=$srcdir"
echo " rsync_bin=$rsync_bin"
echo " srcdir=$srcdir"
-testuser=`whoami || echo UNKNOWN`
+if [ -f /usr/bin/whoami ]; then
+ testuser=`/usr/bin/whoami`
+elif [ -f /usr/ucb/whoami ]; then
+ testuser=`/usr/ucb/whoami`
+else
+ testuser=`id -un || whoami || echo ${LOGNAME:-${USERNAME:-${USER:-'UNKNOWN'}}}`
+fi
echo " testuser=$testuser"
echo " os=`uname -a`"
echo " testuser=$testuser"
echo " os=`uname -a`"
-if test ! -f $rsync_bin
-then
+# It must be "yes", not just nonnull
+if [ "x$preserve_scratch" = xyes ]; then
+ echo " preserve_scratch=yes"
+else
+ echo " preserve_scratch=no"
+fi
+
+
+if [ ! -f "$rsync_bin" ]; then
echo "rsync_bin $rsync_bin is not a file" >&2
exit 2
fi
echo "rsync_bin $rsync_bin is not a file" >&2
exit 2
fi
-if test ! -d $srcdir
-then
+if [ ! -d "$srcdir" ]; then
echo "srcdir $srcdir is not a directory" >&2
exit 2
fi
RSYNC="$rsync_bin"
echo "srcdir $srcdir is not a directory" >&2
exit 2
fi
RSYNC="$rsync_bin"
+#RSYNC="valgrind --tool=addrcheck $rsync_bin"
export rsync_bin RSYNC
export rsync_bin RSYNC
@@
-189,14
+200,13
@@
maybe_discard_scratch() {
return 0
}
return 0
}
-if [ "x$whichtests" = x ]
-then
+if [ "x$whichtests" = x ]; then
whichtests="*.test"
fi
for testscript in $suitedir/$whichtests
do
whichtests="*.test"
fi
for testscript in $suitedir/$whichtests
do
- testbase=`echo $testscript | sed
's!.*/!!' | sed
-e 's/.test\$//'`
+ testbase=`echo $testscript | sed
-e 's!.*/!!'
-e 's/.test\$//'`
scratchdir="$scratchbase.$testbase"
prep_scratch
scratchdir="$scratchbase.$testbase"
prep_scratch
@@
-211,6
+221,11
@@
do
echo "----- $testbase log follows"
cat "$scratchdir/test.log"
echo "----- $testbase log ends"
echo "----- $testbase log follows"
cat "$scratchdir/test.log"
echo "----- $testbase log ends"
+ if [ -f "$scratchdir/rsyncd.log" ]; then
+ echo "----- $testbase rsyncd.log follows"
+ cat "$scratchdir/rsyncd.log"
+ echo "----- $testbase rsyncd.log ends"
+ fi
fi
case $result in
fi
case $result in
@@
-221,7
+236,8
@@
do
;;
77)
# backticks will fill the whole file onto one line, which is a feature
;;
77)
# backticks will fill the whole file onto one line, which is a feature
- echo "SKIP $testbase (`cat \"$scratchdir/whyskipped\"`)"
+ whyskipped=`cat "$scratchdir/whyskipped"`
+ echo "SKIP $testbase ($whyskipped)"
skipped=`expr $skipped + 1`
maybe_discard_scratch
;;
skipped=`expr $skipped + 1`
maybe_discard_scratch
;;
@@
-235,8
+251,7
@@
do
*)
echo "FAIL $testbase"
failed=`expr $failed + 1`
*)
echo "FAIL $testbase"
failed=`expr $failed + 1`
- if [ "x$nopersist" = "xyes" ]
- then
+ if [ "x$nopersist" = xyes ]; then
exit 1
fi
esac
exit 1
fi
esac