# License along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
tmpdir="$scratchdir"
fromdir="$tmpdir/from"
todir="$tmpdir/to"
chkdir="$tmpdir/chk"
+# For itemized output:
+all_plus='+++++++++'
+allspace=' '
+dots='.....' # trailing dots after changes
+tab_ch=' ' # a single tab character
+
# Berkley's nice.
PATH="$PATH:/usr/ucb"
-if diff -u "$srcdir/testsuite/rsync.fns" "$srcdir/testsuite/rsync.fns" >/dev/null 2>&1; then
+if diff -u "$suitedir/rsync.fns" "$suitedir/rsync.fns" >/dev/null 2>&1; then
diffopt="-u"
else
diffopt="-c"
fi
}
+set_cp_destdir() {
+ while test $# -gt 1; do
+ shift
+ done
+ destdir="$1"
+}
+
+# Perform a "cp -p", making sure that timestamps are really the same,
+# even if the copy rounded microsecond times on the destination file.
+cp_touch() {
+ cp -p "${@}" || test_fail "cp -p failed"
+ if test $# -gt 2 -o -d "$2"; then
+ set_cp_destdir "${@}" # sets destdir var
+ while test $# -gt 1; do
+ destname="$destdir/`basename $1`"
+ touch -r "$destname" "$1" "$destname"
+ shift
+ done
+ else
+ touch -r "$2" "$1" "$2"
+ fi
+}
+
# Call this if you want to filter out verbose messages (-v or -vv) from
# the output of an rsync run (whittling the output down to just the file
# messages). This isn't needed if you use -i without -v.
filter_outfile() {
sed -e '/^building file list /d' \
+ -e '/^sending incremental file list/d' \
-e '/^created directory /d' \
-e '/^done$/d' \
-e '/ --whole-file$/d' \
-e '/^total: /d' \
+ -e '/^client charset: /d' \
+ -e '/^server charset: /d' \
-e '/^$/,$d' \
<"$outfile" >"$outfile.new"
mv "$outfile.new" "$outfile"
}
rsync_ls_lR() {
- find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls"
+ find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls" $TLS_ARGS
+}
+
+get_testuid() {
+ id 2>/dev/null | sed 's/^[^0-9]*\([0-9][0-9]*\).*/\1/'
}
check_perms() {
# Many machines do not have "mkdir -p", so we have to build up long paths.
# How boring.
makepath() {
- echo " makepath $1"
- p="$1"
- (
+ for p in "${@}"; do
+ (echo " makepath $p"
+
# Absolut Unix.
if echo $p | grep '^/' >/dev/null
then
cd /
fi
- # This will break if $1 contains a space.
+ # This will break if $p contains a space.
for c in `echo $p | tr '/' ' '`
do
if [ -d "$c" ] || mkdir "$c"
else
echo "failed to create $c" >&2; return $?
fi
- done
- )
+ done)
+ done
}
eval "$1"
status=$?
if [ $status != 0 ]; then
- failed="YES";
+ failed="$failed status=$status"
fi
echo "-------------"
echo ""
( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
( cd "$3" && rsync_ls_lR . ) > "$tmpdir/ls-to"
- diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed=YES
+ diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed="$failed dir-diff"
echo "-------------"
echo "check how the files compare with diff:"
if [ "x$4" != x ]; then
echo " === Skipping (as directed) ==="
else
- diff -r $diffopt "$2" "$3" || failed=YES
+ diff -r $diffopt "$2" "$3" || failed="$failed file-diff"
fi
echo "-------------"
if [ -z "$failed" ] ; then
return 0
- else
- return 1
fi
+
+ echo "Failed: $failed"
+ return 1
}
logfile="$scratchdir/rsyncd.log"
hostname=`uname -n`
+ uid_setting='uid = 0'
+ gid_setting='gid = 0'
+ case `get_testuid` in
+ 0) ;;
+ *)
+ # Non-root cannot specify uid & gid settings
+ uid_setting="#$uid_setting"
+ gid_setting="#$gid_setting"
+ ;;
+ esac
+
cat >"$conf" <<EOF
# rsyncd configuration file autogenerated by $0
pid file = $pidfile
use chroot = no
-hosts allow = localhost 127.0.0.1 $hostname
+munge symlinks = no
+hosts allow = localhost 127.0.0.0/24 192.168.0.0/16 10.0.0.0/8 $hostname
log file = $logfile
log format = %i %h [%a] %m (%u) %l %f%L
transfer logging = yes
-exclude = foobar.baz
-max verbosity = 9
-uid = 0
-gid = 0
+exclude = ? foobar.baz
+max verbosity = 4
+$uid_setting
+$gid_setting
[test-from]
path = $fromdir
read only = yes
+ comment = r/o
[test-to]
path = $todir
read only = no
+ comment = r/w
[test-scratch]
path = $scratchdir
read only = no
+
+[test-hidden]
+ path = $fromdir
+ list = no
EOF
+
+ # Build a helper script to ignore exit code 23
+ ignore23="$scratchdir/ignore23"
+ echo "building help script $ignore23"
+
+ cat >"$ignore23" <<'EOT'
+if "${@}"; then
+ exit
+fi
+
+ret=$?
+
+if test $ret = 23; then
+ exit
+fi
+
+exit $ret
+EOT
+chmod +x "$ignore23"
}