X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/5322d1ddd3b63092a1566e18fddd13f619bd1cba..70a3fbf967717678e2edd0fb2c992e5a2c59a2b0:/test/common.sh.in diff --git a/test/common.sh.in b/test/common.sh.in index 83578724..70214127 100644 --- a/test/common.sh.in +++ b/test/common.sh.in @@ -35,7 +35,7 @@ output_md5() #### the same line, the caller needs to add it. This avoids #### differences due to a leading '*' binary file indicator, for #### text files, on some platforms (Cygwin). - @MD5SUM@ $* | @MD5FMT@ | cut -d ' ' -f 1 + @MD5SUM@ $* | @MD5FMT@ | awk '{print $1}' } #### Use built-in $((...)) in test suite if shell supports it. @@ -133,7 +133,7 @@ check_for_hard_links () { #### 'keep first'. #### If different, global variable "failed" is incremented. #### If there's an optional 'ignore space' argument, diff -b will -#### be used instead of cmp to compare the files. +#### be used instead of cmp to compare the files. check() { first=$1; shift second=$1; shift @@ -143,7 +143,7 @@ check() { case $1 in 'keep first') keepfirst=1 ;; 'ignore space') ignorespace=1 ;; - *) echo "$0: invalid check() argument \"$1\" in test suite" ;; + *) echo "$0: invalid check() argument \"$1\" in test suite" >&2 ;; esac shift done @@ -166,6 +166,8 @@ check() { echo echo "$0: test failed, outputs are in $first and $second." failed=`expr ${failed:-0} + 1` + #### Set return status of the function. + [ $failed -eq 0 ] fi }