From: Wayne Davison <wayned@samba.org>
Date: Mon, 21 Feb 2005 07:26:59 +0000 (+0000)
Subject: If checkit is passed a 4th arg, skip the file-diffing step.
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/30688bf11b7577ca109b5afb5fcd2cdee018ea2a

If checkit is passed a 4th arg, skip the file-diffing step.
This is used by the devices.test script.
---

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