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
The static last_in value in match_gid() needed to default to -2 so
[rsync/rsync.git]
/
runtests.sh
diff --git
a/runtests.sh
b/runtests.sh
index
31c4936
..
68d7313
100755
(executable)
--- a/
runtests.sh
+++ b/
runtests.sh
@@
-142,11
+142,20
@@
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`
+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
@@
-221,7
+230,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
;;