aboutsummaryrefslogtreecommitdiffstats
path: root/testsuite
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2011-01-01 17:28:56 -0800
committerWayne Davison <wayned@samba.org>2011-01-01 18:09:16 -0800
commit8b6ebde1f328c37fededb0acad85c0b0b5b835e5 (patch)
treec5e9ce882fbca643978acf28187dcade7a08a0c4 /testsuite
parent1c99b1d956a4cb4dcc36e9ed227a98fb40c1a943 (diff)
downloadandroid_external_rsync-8b6ebde1f328c37fededb0acad85c0b0b5b835e5.tar.gz
android_external_rsync-8b6ebde1f328c37fededb0acad85c0b0b5b835e5.tar.bz2
android_external_rsync-8b6ebde1f328c37fededb0acad85c0b0b5b835e5.zip
Be clear on which part(s) of testsuite's checkit() failed.
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/rsync.fns11
1 files changed, 6 insertions, 5 deletions
diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
index 649039dc..7ea2a9c4 100644
--- a/testsuite/rsync.fns
+++ b/testsuite/rsync.fns
@@ -222,7 +222,7 @@ checkit() {
eval "$1"
status=$?
if [ $status != 0 ]; then
- failed="YES";
+ failed="$failed status=$status"
fi
echo "-------------"
@@ -230,7 +230,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:"
@@ -238,15 +238,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
}