X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/b5c7e78352a4744a97c88c4d952847b95bf9a42d..d231c858d574d37b6cc3d3cef82b06cb04f13b81:/test/common.sh.in diff --git a/test/common.sh.in b/test/common.sh.in index cd99ad50..4c804155 100644 --- a/test/common.sh.in +++ b/test/common.sh.in @@ -96,8 +96,14 @@ if [ -t 1 ] ; then } else # don't emit anything if stdout is not connected to a tty. - progress_update () : - progress_done () : + progress_update () + { + : + } + progress_done () + { + : + } fi check_for_hard_links () { @@ -122,10 +128,13 @@ check_for_hard_links () { #### If different, global variable "failed" is incremented. check() { #### POSIX diff should support -c. - if diff -c "$1" "$2"; then + if cmp -s "$1" "$2"; then test $# -lt 3 -o "$3" != 'keep first' && rm -f "$1" rm -f "$2" else + echo + diff -c "$1" "$2" + echo echo "$0: test failed, outputs are in $1 and $2." failed=`expr ${failed:-0} + 1` fi