X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=test%2Fcommon.sh.in;h=54f3b8ee8e8e4cf82e4012a2ce0ea3c5c8340278;hb=702512891eb9936eab9626558387b6d2188d3a2c;hp=fa8a03798616e40c31cf109b67935a2db964816f;hpb=4078e8a24878c584541a6caa8554c751121ab2b4;p=mmh

diff --git a/test/common.sh.in b/test/common.sh.in
index fa8a037..54f3b8e 100644
--- a/test/common.sh.in
+++ b/test/common.sh.in
@@ -14,13 +14,15 @@ 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 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
+unset MHLDEBUG MHPDEBUG MHWDEBUG MM_CHARSET
 
 output_md5()
 {
@@ -133,7 +135,7 @@ setup_test ()
 {
   MH=${MH_TEST_DIR}/Mail/.mh_profile
   MHMTSCONF=${MH_INST_DIR}${sysconfdir}/mts.conf
-  PATH=${MH_INST_DIR}${bindir}:${PATH}
+  PATH=${MH_INST_DIR}${bindir}:${MH_INST_DIR}${auxexecdir}:${PATH}
   MH_LIB_DIR=${MH_INST_DIR}${auxexecdir}
   export MH MHMTSCONF MH_LIB_DIR PATH
 
@@ -145,6 +147,12 @@ setup_test ()
   else
     (cd ${MH_OBJ_DIR} && make DESTDIR=${MH_INST_DIR} SETGID_MAIL= install) ||
       exit 1
+
+    #### Don't test with sendmail because it would really send the
+    #### mail.  If configured to use sendmail, change to smtp instead
+    #### so that we use fakesmtp.
+    sed -e 's/mts: *sendmail/mts: smtp/' ${MHMTSCONF} >${MHMTSCONF}.new
+    mv -f ${MHMTSCONF}.new ${MHMTSCONF}
   fi
 
   # clean old test data
@@ -154,6 +162,7 @@ setup_test ()
   cat > $MH <<EOF || exit 1
 Path: ${MH_TEST_DIR}/Mail
 mhlproc: ${MH_LIB_DIR}/mhl
+moreproc: cat
 showproc: ${MH_LIB_DIR}/mhl
 postproc: ${MH_LIB_DIR}/post
 fileproc: ${MH_INST_DIR}${bindir}/refile