Add two new format functions: %(myhost) and %(myname).

[mmh] / test / common.sh.in

diff --git a/test/common.sh.in b/test/common.sh.in
index 4c7089c..34767f4 100644 (file)
--- a/test/common.sh.in
+++ b/test/common.sh.in
@@ -84,21 +84,16 @@ 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_INST_DIR}${auxexecdir}/mhl
 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