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
Moved a function.
[rsync/rsync.git]
/
runtests.sh
diff --git
a/runtests.sh
b/runtests.sh
index
50f4c8b
..
e64f1b3
100755
(executable)
--- a/
runtests.sh
+++ b/
runtests.sh
@@
-125,6
+125,9
@@
set -e
RUNSHFLAGS='-e'
RUNSHFLAGS='-e'
+# for Solaris
+PATH="/usr/xpg4/bin/:$PATH"
+
if [ -n "$loglevel" ] && [ "$loglevel" -gt 8 ]
then
if set -x
if [ -n "$loglevel" ] && [ "$loglevel" -gt 8 ]
then
if set -x
@@
-139,16
+142,20
@@
echo "$0 running in `pwd`"
echo " rsync_bin=$rsync_bin"
echo " srcdir=$srcdir"
echo " rsync_bin=$rsync_bin"
echo " srcdir=$srcdir"
-if testuser=`whoami`
-then
- :
-else
- testuser='(unknown)'
-fi
+testuser=`id -un || whoami || echo UNKNOWN`
echo " testuser=$testuser"
echo " os=`uname -a`"
echo " testuser=$testuser"
echo " os=`uname -a`"
+# It must be "yes", not just nonnull
+if test "x$preserve_scratch" = xyes
+then
+ echo " preserve_scratch=yes"
+else
+ echo " preserve_scratch=no"
+fi
+
+
if test ! -f $rsync_bin
then
echo "rsync_bin $rsync_bin is not a file" >&2
if test ! -f $rsync_bin
then
echo "rsync_bin $rsync_bin is not a file" >&2
@@
-213,6
+220,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
@@
-222,7
+234,9
@@
do
maybe_discard_scratch
;;
77)
maybe_discard_scratch
;;
77)
- echo "SKIP $testbase"
+ # backticks will fill the whole file onto one line, which is a feature
+ whyskipped=`cat "$scratchdir/whyskipped"`
+ echo "SKIP $testbase ($whyskipped)"
skipped=`expr $skipped + 1`
maybe_discard_scratch
;;
skipped=`expr $skipped + 1`
maybe_discard_scratch
;;