Rework multibyte test so it will calculate the width of all of the

[nmh] / test / common.sh.in

diff --git a/test/common.sh.in b/test/common.sh.in
index b791a7f04be7357f9aab58bf627172ffa4d36647..a117d6fe11729cace35c6a23dc5b814bebe58d18 100644 (file)
--- a/test/common.sh.in
+++ b/test/common.sh.in
@@ -90,7 +90,7 @@ if [ -t 1 ] ; then
     # note \r so next update will overwrite
     printf '%3d%%\r' $PERC
   }
-  
+
   progress_done ()
   {
     printf '100%%\n'
@@ -163,9 +163,8 @@ setup_test ()
 {
   MH="${MH_TEST_DIR}/Mail/.mh_profile"
   MHMTSCONF="${MH_INST_DIR}${sysconfdir}/mts.conf"
-  PATH="${MH_INST_DIR}${bindir}:${PATH}"
   MH_LIB_DIR="${MH_INST_DIR}${auxexecdir}"
-  export MH MHMTSCONF MH_LIB_DIR PATH
+  export MH MHMTSCONF MH_LIB_DIR
 
   #
   # Only install once
@@ -190,6 +189,9 @@ setup_test ()
         "${MHMTSCONF}.old" >"${MHMTSCONF}"
   fi
 
+  PATH="${MH_INST_DIR}${bindir}:${PATH}"
+  export PATH
+
   # clean old test data
   trap "rm -rf '$MH_TEST_DIR/Mail'" 0
   # setup test data
@@ -215,7 +217,7 @@ EOF
     cp "${MH_INST_DIR}${sysconfdir}/${f}" "${MH_TEST_DIR}/Mail" || exit 1
   done
 
-  $MH_TEST_DIR/inst/$prefix/bin/folder -create +inbox > /dev/null
+  folder -create +inbox > /dev/null
   # create 10 basic messages
   for i in 1 2 3 4 5 6 7 8 9 10;
   do