Clean up (and hopefully improve) the autoconf iconv tests.

[nmh] / test / common.sh.in

diff --git a/test/common.sh.in b/test/common.sh.in
index dd68f77455e49decaa7dc1d8e4db966dabc39e2b..f7624ca85a70a6663812ea4f8ecf00ed7c569606 100644 (file)
--- a/test/common.sh.in
+++ b/test/common.sh.in
@@ -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.
     #### 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%' \
     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
   fi
 
   # clean old test data