X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=test%2Fcommon.sh.in;h=e596fb1ce535e9b2244582b146f2445652e07646;hb=360f0c24ea63ed5420365703dd11f72caca0d183;hp=2308d7071544944ed79adb17669a3581facf42ae;hpb=18b138a1003cf07114c2a4d03e4372e4e7bdc5f4;p=mmh diff --git a/test/common.sh.in b/test/common.sh.in index 2308d70..e596fb1 100644 --- a/test/common.sh.in +++ b/test/common.sh.in @@ -21,7 +21,11 @@ export MH_INST_DIR output_md5() { - @MD5SUM@ $* | @MD5FMT@ + #### Output just the checksum. If the filename needs to appear on + #### 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 } test_skip () @@ -93,18 +97,19 @@ check() { fi } -#### check_string() requires two arguments, the first is a program and -#### arguments, the second is its expected one-line output string. If -#### the actual output does not match that string, an error message is -#### printed and global variable "failed" is incremented. -check_string() { +#### run_test() requires two arguments, the first is a program and +#### arguments, the second is its expected one-line output string. +#### If the actual output does not match that string: +#### an error message is printed and global variable "failed" is incremented; +#### if there is an optional third argument, it is used in the error message. +run_test() { #### Invert exit status to prevent triggering immediate exit due to set -e. - ! actual_output=`$1 2>&1` - if test "$actual_output" != "$2"; then - echo "$0: \"$1\" should have produced:" 1>&2 - echo " $2" 1>&2 - echo "but instead produced:" 1>&2 - echo " $actual_output" 1>&2 + ! actual_output="`$1 2>&1`" + if test x"$actual_output" != x"$2"; then + echo "$0: ${3:-\"$1\"} expected:" 1>&2 + echo " '$2'" 1>&2 + echo "but instead got:" 1>&2 + echo " '$actual_output'" 1>&2 failed=`expr ${failed:-0} + 1` fi } @@ -130,13 +135,15 @@ setup_test () cat > $MH <