X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/22558cdd7e827f3e838e0e1f50f9fb15ec3369e4..4104c3bf52231d2cb1f4c55b8e733d0b304f70ec:/testsuite/rsync.fns diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns index f5c7f45a..a59742ab 100644 --- a/testsuite/rsync.fns +++ b/testsuite/rsync.fns @@ -165,17 +165,23 @@ checkit() { failed="YES"; fi - echo "-------------" - echo "check how the files compare with diff:" - echo "" - diff -r $diffopt "$2" "$3" || failed=YES - 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