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

diff --git a/test/common.sh.in b/test/common.sh.in
index da526de5..f7624ca8 100644
--- a/test/common.sh.in
+++ b/test/common.sh.in
@@ -63,7 +63,7 @@ findprog()
       D=.
     fi
     if [ -f "$D/$PROG"  -a  -x "$D/$PROG" ]; then
-      printf "$D/$PROG"
+      printf '%s\n' "$D/$PROG"
       break
     fi
   done
@@ -87,12 +87,12 @@ progress_update ()
   # 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
+  printf '%3d%%\r' $PERC
 }
 
 progress_done ()
 {
-  printf "100%%\n"
+  printf '100%%\n'
 }
 
 check_for_hard_links () {
@@ -167,11 +167,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 +194,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 +208,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