diffopt="-c"
fi
+HOME="$scratchdir"
+export HOME
+
runtest() {
echo $ECHO_N "Test $1: $ECHO_C"
if eval "$2"
rsync_ls_lR() {
- find "$@" -print | sort | xargs "$TOOLDIR/tls"
+ find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls"
}
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"
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