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
An easy way to run all the commands in prepare-source.mak.
[rsync/rsync.git]
/
runtests.sh
diff --git
a/runtests.sh
b/runtests.sh
index
7b0654d
..
558d986
100755
(executable)
--- a/
runtests.sh
+++ b/
runtests.sh
@@
-85,7
+85,7
@@
# they're explicitly given on the command line.
# Also, we can't count on 'cp -a' or 'mkdir -p', although they're
# they're explicitly given on the command line.
# Also, we can't count on 'cp -a' or 'mkdir -p', although they're
-# pretty handy.
+# pretty handy
(see function makepath for the latter)
.
# I think some of the GNU documentation suggests that we shouldn't
# rely on shell functions. However, the Bash manual seems to say that
# I think some of the GNU documentation suggests that we shouldn't
# rely on shell functions. However, the Bash manual seems to say that
@@
-100,6
+100,8
@@
# You cannot do "export VAR=VALUE" all on one line; the export must be
# separate from the assignment. (SCO SysV)
# You cannot do "export VAR=VALUE" all on one line; the export must be
# separate from the assignment. (SCO SysV)
+# Don't rely on grep -q, as that doesn't work everywhere -- just redirect
+# stdout to /dev/null to keep it quiet.
# STILL TO DO:
# STILL TO DO:
@@
-124,14
+126,13
@@
set -e
. "./shconfig"
RUNSHFLAGS='-e'
. "./shconfig"
RUNSHFLAGS='-e'
+export RUNSHFLAGS
# for Solaris
# 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,34
+143,39
@@
echo "$0 running in `pwd`"
echo " rsync_bin=$rsync_bin"
echo " srcdir=$srcdir"
echo " rsync_bin=$rsync_bin"
echo " srcdir=$srcdir"
-if
test -e /usr/bin/whoami
; then
+if
[ -f /usr/bin/whoami ]
; then
testuser=`/usr/bin/whoami`
testuser=`/usr/bin/whoami`
-elif
test -e /usr/ucb/whoami
; then
+elif
[ -f /usr/ucb/whoami ]
; then
testuser=`/usr/ucb/whoami`
testuser=`/usr/ucb/whoami`
+elif [ -f /bin/whoami ]; then
+ testuser=`/bin/whoami`
else
else
- testuser=`id -un
|| whoami || echo UNKNOWN
`
+ testuser=`id -un
2>/dev/null || echo ${LOGNAME:-${USERNAME:-${USER:-'UNKNOWN'}}}
`
fi
echo " testuser=$testuser"
echo " os=`uname -a`"
# It must be "yes", not just nonnull
fi
echo " testuser=$testuser"
echo " os=`uname -a`"
# It must be "yes", not just nonnull
-if test "x$preserve_scratch" = xyes
-then
+if [ "x$preserve_scratch" = xyes ]; then
echo " preserve_scratch=yes"
else
echo " preserve_scratch=no"
fi
echo " preserve_scratch=yes"
else
echo " preserve_scratch=no"
fi
+# We'll use setfacl if it's around and it supports the -k option.
+if setfacl --help 2>/dev/null | grep ' -k,' >/dev/null; then
+ setfacl=setfacl
+else
+ setfacl=true
+fi
-if test ! -f $rsync_bin
-then
+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
echo "srcdir $srcdir is not a directory" >&2
exit 2
fi
@@
-197,6
+203,9
@@
export scratchdir suitedir
prep_scratch() {
[ -d "$scratchdir" ] && rm -rf "$scratchdir"
mkdir "$scratchdir"
prep_scratch() {
[ -d "$scratchdir" ] && rm -rf "$scratchdir"
mkdir "$scratchdir"
+ # Get rid of default ACLs and dir-setgid to avoid confusing some tests.
+ $setfacl -k "$scratchdir"
+ chmod g-s "$scratchdir"
return 0
}
return 0
}
@@
-205,8
+214,7
@@
maybe_discard_scratch() {
return 0
}
return 0
}
-if [ "x$whichtests" = x ]
-then
+if [ "x$whichtests" = x ]; then
whichtests="*.test"
fi
whichtests="*.test"
fi
@@
-257,8
+265,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