diffopt="-c"
fi
+HOME="$scratchdir"
+export HOME
+
runtest() {
echo $ECHO_N "Test $1: $ECHO_C"
if eval "$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 '/^created directory /d' \
+ -e '/^done$/d' \
+ -e '/ --whole-file$/d' \
+ -e '/^total: /d' \
+ -e '/^$/,$d' \
+ <"$outfile" >"$outfile.new"
+ mv "$outfile.new" "$outfile"
+}
+
printmsg() {
echo "$1"
}
-
rsync_ls_lR() {
- find "$@" -print | sort | xargs "$TOOLDIR/tls"
+ find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls"
+}
+
+check_perms() {
+ perms=`"$TOOLDIR/tls" "$1" | sed 's/^[-d]\(.........\).*/\1/'`
+ if test $perms = $2; then
+ return 0
+ fi
+ echo "permissions: $perms on $1"
+ echo "should be: $2"
+ test_fail "failed test $3"
}
rsync_getgroups() {
ln -s nolf "$fromdir/nolf-symlink"
umask 022
- cat $srcdir/*.c > "$fromdir/text"
+ cat "$srcdir"/*.c > "$fromdir/text"
mkdir "$fromdir/dir"
cp "$fromdir/text" "$fromdir/dir"
mkdir "$fromdir/dir/subdir"
####################
# Many machines do not have "mkdir -p", so we have to build up long paths.
# How boring.
-makepath () {
+makepath() {
echo " makepath $1"
p="$1"
(
failed="YES";
fi
- echo "-------------"
- echo "check how the files compare with diff:"
- echo ""
- for f in `cd "$2"; find . -type f -print `
- do
- diff $diffopt "$2"/"$f" "$3"/"$f" || failed=YES
- done
-
echo "-------------"
echo "check how the directory listings compare with diff:"
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
+
+ echo "-------------"
+ echo "check how the files compare with diff:"
+ echo ""
+ if [ "x$4" != x ]; then
+ echo " === Skipping (as directed) ==="
+ else
+ diff -r $diffopt "$2" "$3" || failed=YES
+ fi
+
+ echo "-------------"
if [ -z "$failed" ] ; then
return 0
else
port=2612
pidfile="$scratchdir/rsyncd.pid"
logfile="$scratchdir/rsyncd.log"
+ hostname=`uname -n`
cat >"$conf" <<EOF
# rsyncd configuration file autogenerated by $0
pid file = $pidfile
use chroot = no
-hosts allow = localhost, 127.0.0.1
+hosts allow = localhost 127.0.0.1 $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
[test-to]
path = $todir
read only = no
+
+[test-scratch]
+ path = $scratchdir
+ read only = no
EOF
}