From 30688bf11b7577ca109b5afb5fcd2cdee018ea2a Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Mon, 21 Feb 2005 07:26:59 +0000 Subject: [PATCH] If checkit is passed a 4th arg, skip the file-diffing step. This is used by the devices.test script. --- testsuite/rsync.fns | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) 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 -- 2.34.1