From 58d657c98f7e49ecdfefd72d525cca570d48de77 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Sat, 1 Jan 2011 17:28:56 -0800 Subject: [PATCH] Be clear on which part(s) of testsuite's checkit() failed. --- testsuite/rsync.fns | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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 } -- 2.47.3