X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=test%2Fcommon.sh.in;h=f0545e624958c7e3ba79b115452bd2d6a44c3c1d;hb=deceb473fdbaf526c46ff696a8d7afc3a81e4d90;hp=4c7089c410c7f394e78da93e5c05c49236774471;hpb=6106441685a38400d9aa94ccb7218218102f941c;p=mmh

diff --git a/test/common.sh.in b/test/common.sh.in
index 4c7089c..f0545e6 100644
--- a/test/common.sh.in
+++ b/test/common.sh.in
@@ -1,6 +1,24 @@
 # Common helper routines for test shell scripts -- intended to be sourced by them
 # @configure_input@
 
+
+#### The following exported variables are set by "make check".  Ensure
+#### that they are set here so that individual tests can be run
+#### outside of make.  Requires that MH_OBJ_DIR be set on entry.
+test -z "$MH_TEST_DIR"  &&  MH_TEST_DIR="$MH_OBJ_DIR/test/testdir"
+test -z "$prefix"  &&  prefix=@prefix@
+test -z "$datarootdir"  &&  datarootdir=@datarootdir@
+test -z "$exec_prefix"  &&  exec_prefix=@exec_prefix@
+test -z "$auxexecdir"  &&  auxexecdir="@libdir@"
+test -z "$bindir"  &&  bindir="@bindir@"
+test -z "$mandir"  &&  mandir="@mandir@"
+test -z "$sysconfdir"  &&  sysconfdir="@sysconfdir@"
+export MH_TEST_DIR auxexecdir bindir mandir sysconfdir
+
+test -z "$MH_INST_DIR"  &&  MH_INST_DIR=${MH_TEST_DIR}/inst
+export MH_INST_DIR
+
+
 output_md5()
 {
   @MD5SUM@ $* | @MD5FMT@
@@ -58,22 +76,50 @@ progress_done ()
   printf "100%%\n"
 }
 
+#### 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.
+    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 ()
 {
   export MH=${MH_TEST_DIR}/Mail/.mh_profile
-  export MH_INST_DIR=${MH_TEST_DIR}/inst
   export MHMTSCONF=${MH_INST_DIR}${sysconfdir}/mts.conf
   export PATH=${MH_INST_DIR}${bindir}:${PATH}
-
-  if [ -z "${srcdir}" ]; then
-    echo "srcdir not set; aborting"
-    exit 1
-  fi
+  export MH_LIB_DIR=${MH_INST_DIR}${auxexecdir}
 
   #
-  # Only do this once
+  # Only install once
   #
-
   if [ ! -d ${MH_INST_DIR}${bindir} ]; then
     (cd ${MH_OBJ_DIR} && make DESTDIR=${MH_INST_DIR} install) || exit 1
   fi
@@ -84,21 +130,18 @@ setup_test ()
   mkdir $MH_TEST_DIR/Mail || exit 1
   cat > $MH <<EOF || exit 1
 Path: ${MH_TEST_DIR}/Mail
-mhlproc: ${MH_OBJ_DIR}/uip/mhl
+mhlproc: ${MH_LIB_DIR}/mhl
+showproc: ${MH_LIB_DIR}/mhl
+postproc: ${MH_LIB_DIR}/post
 EOF
 
   for f in MailAliases components digestcomps distcomps forwcomps mhl.body \
   	   mhl.digest mhl.format mhl.forward mhl.headers mhl.reply \
-	   rcvdistcomps replcomps replgroupcomps scan.MMDDYY \
+	   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 ${srcdir}/etc/${f} ${MH_TEST_DIR}/Mail || exit 1
-  done
-
-  for f in mhn.defaults mts.conf
-  do
-    cp ${MH_OBJ_DIR}/etc/${f} ${MH_TEST_DIR}/Mail || exit 1
+    cp ${MH_INST_DIR}${sysconfdir}/${f} ${MH_TEST_DIR}/Mail || exit 1
   done
 
   folder -create +inbox > /dev/null