X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/a7a1cc2c75512623fa105c09570954afc4ef0b7f..042dc7360efae7efc883def2792760b7460ef493:/testsuite/rsync.fns diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns index b4bbd37d..a59742ab 100644 --- a/testsuite/rsync.fns +++ b/testsuite/rsync.fns @@ -50,7 +50,7 @@ printmsg() { rsync_ls_lR() { - find "$@" -print | sort | xargs "$TOOLDIR/tls" + find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls" } rsync_getgroups() { @@ -165,20 +165,23 @@ checkit() { 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