X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=test%2Fcommon.sh.in;h=1162566ffb27a136361106f926fad4b13f80b1e5;hb=67c56bad23525bd3d5f4d155b4f602a4183c6170;hp=0d7e858d842e49030f9941846dcb673f351e7be1;hpb=f0bcd0b87a07dbe86db190f554a77fd89f4823d8;p=mmh

diff --git a/test/common.sh.in b/test/common.sh.in
index 0d7e858..1162566 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 ()
@@ -78,10 +82,36 @@ progress_done ()
 
 #### check() requires two arguments, each the name of a file to be
 #### diff'ed.
+#### If the same, the second file is removed.  And the first file is
+####   removed unless the optional third argument has a value of
+####   'keep first'.
 #### If different, global variable "failed" is incremented.
 check() {
     #### POSIX diff should support -c.
-    diff -c "$1" "$2"  ||  failed=`expr ${failed:-0} + 1`
+    if diff -c "$1" "$2"; then
+      test $# -lt 3 -o "$3" != 'keep first'  &&  rm -f "$1"
+      rm -f "$2"
+    else
+      echo "$0: test failed, outputs are in $1 and $2."
+      failed=`expr ${failed:-0} + 1`
+    fi
+}
+
+#### 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 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
 }
 
 setup_test ()
@@ -105,13 +135,16 @@ setup_test ()
   cat > $MH <<EOF || exit 1
 Path: ${MH_TEST_DIR}/Mail
 mhlproc: ${MH_LIB_DIR}/mhl
+showproc: ${MH_LIB_DIR}/mhl
+postproc: ${MH_LIB_DIR}/post
+fileproc: ${MH_INST_DIR}${bindir}/refile
 EOF
 
   for f in MailAliases components digestcomps distcomps forwcomps mhl.body \
-  	   mhl.digest mhl.format mhl.forward mhl.headers mhl.reply \
-	   mhn.defaults rcvdistcomps replcomps replgroupcomps scan.MMDDYY \
-	   scan.YYYYMMDD scan.default scan.mailx scan.nomime scan.size \
-	   scan.time scan.timely scan.unseen
+           mhl.digest mhl.format mhl.forward mhl.headers mhl.reply \
+           mhn.defaults rcvdistcomps replcomps replgroupcomps scan.MMDDYY \
+           scan.YYYYMMDD scan.default scan.mailx scan.nomime scan.size \
+           scan.time scan.timely scan.unseen
   do
     cp ${MH_INST_DIR}${sysconfdir}/${f} ${MH_TEST_DIR}/Mail || exit 1
   done