From: Wayne Davison <wayned@samba.org>
Date: Sun, 2 Jan 2011 01:28:56 +0000 (-0800)
Subject: Be clear on which part(s) of testsuite's checkit() failed.
X-Git-Tag: v3.0.8pre1~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=58d657c98f7e49ecdfefd72d525cca570d48de77;p=thirdparty%2Frsync.git

Be clear on which part(s) of testsuite's checkit() failed.
---

diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
index 412ea3be..903bd6cc 100644
--- a/testsuite/rsync.fns
+++ b/testsuite/rsync.fns
@@ -223,7 +223,7 @@ checkit() {
     eval "$1" 
     status=$?
     if [ $status != 0 ]; then
-	failed="YES";
+	failed="$failed status=$status"
     fi
 
     echo "-------------"
@@ -231,7 +231,7 @@ checkit() {
     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
+    diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed="$failed dir-diff"
 
     echo "-------------"
     echo "check how the files compare with diff:"
@@ -239,15 +239,16 @@ checkit() {
     if [ "x$4" != x ]; then
 	echo "  === Skipping (as directed) ==="
     else
-	diff -r $diffopt "$2" "$3" || failed=YES
+	diff -r $diffopt "$2" "$3" || failed="$failed file-diff"
     fi
 
     echo "-------------"
     if [ -z "$failed" ] ; then
 	return 0
-    else
-	return 1
     fi
+
+    echo "Failed: $failed"
+    return 1
 }