X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/a4390a1c51b3a709d6aeefeba2fdd6fa8d525012..d231c858d574d37b6cc3d3cef82b06cb04f13b81:/test/common.sh.in

diff --git a/test/common.sh.in b/test/common.sh.in
index bd33d25b..4c804155 100644
--- a/test/common.sh.in
+++ b/test/common.sh.in
@@ -13,16 +13,15 @@ test -z "$auxexecdir"  &&  auxexecdir="@libdir@"
 test -z "$bindir"  &&  bindir="@bindir@"
 test -z "$mandir"  &&  mandir="@mandir@"
 test -z "$sysconfdir"  &&  sysconfdir="@sysconfdir@"
-test -z "$pagerpath"  &&  pagerpath="@pagerpath@"
 test -z "$MULTIBYTE_ENABLED"  &&  MULTIBYTE_ENABLED="@MULTIBYTE_ENABLED@"
-export MH_TEST_DIR auxexecdir bindir mandir sysconfdir pagerpath
+export MH_TEST_DIR auxexecdir bindir mandir sysconfdir
 export MULTIBYTE_ENABLED
 
 test -z "$MH_INST_DIR"  &&  MH_INST_DIR="${MH_TEST_DIR}/inst"
 export MH_INST_DIR
 
 unset MHBUILD MHCONTEXT MHMTSUSERCONF MHN MHSHOW MHSTORE MHTMPDIR
-unset MHLDEBUG MHPDEBUG MHWDEBUG MM_CHARSET
+unset MHLDEBUG MHPDEBUG MHWDEBUG MM_CHARSET PAGER
 
 output_md5()
 {
@@ -63,7 +62,7 @@ findprog()
       D=.
     fi
     if [ -f "$D/$PROG"  -a  -x "$D/$PROG" ]; then
-      printf "$D/$PROG"
+      printf '%s\n' "$D/$PROG"
       break
     fi
   done
@@ -77,23 +76,35 @@ require_prog ()
 }
 
 # Some stuff for doing silly progress indicators
-progress_update ()
-{
-  THIS="$1"
-  FIRST="$2"
-  LAST="$3"
-  arith_eval $LAST - $FIRST; RANGE=$arith_val
-  arith_eval $THIS - $FIRST; PROG=$arith_val
-  # this automatically rounds to nearest integer
-  arith_eval 100 \* $PROG / $RANGE; PERC=$arith_val
-  # note \r so next update will overwrite
-  printf "%3d%%\r" $PERC
-}
-
-progress_done ()
-{
-  printf "100%%\n"
-}
+if [ -t 1 ] ; then
+  progress_update ()
+  {
+    THIS="$1"
+    FIRST="$2"
+    LAST="$3"
+    arith_eval $LAST - $FIRST; RANGE=$arith_val
+    arith_eval $THIS - $FIRST; PROG=$arith_val
+    # this automatically rounds to nearest integer
+    arith_eval 100 \* $PROG / $RANGE; PERC=$arith_val
+    # note \r so next update will overwrite
+    printf '%3d%%\r' $PERC
+  }
+  
+  progress_done ()
+  {
+    printf '100%%\n'
+  }
+else
+  # don't emit anything if stdout is not connected to a tty.
+  progress_update ()
+  {
+	:
+  }
+  progress_done ()
+  {
+	:
+  }
+fi
 
 check_for_hard_links () {
   set +e
@@ -117,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
@@ -167,11 +181,12 @@ setup_test ()
     #### so that we use fakesmtp.
     #### And set up the maildrop in the test directory so tests don't
     #### use the user's real maildrop.
+    #### test-slocal needs to look at the original mts.conf, so save it.
+    mv -f "${MHMTSCONF}" "${MHMTSCONF}.old"
     sed -e 's/mts: *.*/mts: smtp/' \
         -e "s%mmdfldir: *.*%mmdfldir: ${MH_TEST_DIR}/Mail%" \
         -e 's%mmdflfil: *.*%mmdflfil: maildrop%' \
-        "${MHMTSCONF}" >"${MHMTSCONF}.new"
-    mv -f "${MHMTSCONF}.new" "${MHMTSCONF}"
+        "${MHMTSCONF}.old" >"${MHMTSCONF}"
   fi
 
   # clean old test data
@@ -193,8 +208,8 @@ 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
+           scan.YYYYMMDD scan.default scan.highlighted 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
@@ -207,6 +222,7 @@ EOF
 From: Test$i <test$i@example.com>
 To: Some User <user@example.com>
 Date: Fri, 29 Sep 2006 00:00:00
+Message-Id: $i@test.nmh
 Subject: Testing message $i
 
 This is message number $i