In setup_test(), set PATH after install.

diff --git a/test/ali/test-ali b/test/ali/test-ali
index d5438744fe98190e75fa37065819dd62a043ff2c..4079790df05a4eb3803411a47b0a6dd16300fa65 100755 (executable)
--- a/test/ali/test-ali
+++ b/test/ali/test-ali
@@ -8,8 +8,7 @@
 # Not tested:
 # -normalize, -nonormalize
 
 # Not tested:
 # -normalize, -nonormalize
 

-# ???? temporary   set -e
-set -x
+set -e

 
 if test -z "${MH_OBJ_DIR}"; then
     srcdir=`dirname $0`/../..
 
 if test -z "${MH_OBJ_DIR}"; then
     srcdir=`dirname $0`/../..


@@ -20,13 +19,6 @@ fi
 
 setup_test
 
 
 setup_test
 

-#### ???? temporary
-ls -l ${MH_INST_DIR}$prefix/bin
-echo $PATH
-export PATH
-scan +inbox # ???? temporary
-#### ???? temporary
-

 expected=$MH_TEST_DIR/$$.expected
 expected_err=$MH_TEST_DIR/$$.expected_err
 actual=$MH_TEST_DIR/$$.actual
 expected=$MH_TEST_DIR/$$.expected
 expected_err=$MH_TEST_DIR/$$.expected_err
 actual=$MH_TEST_DIR/$$.actual

diff --git a/test/common.sh.in b/test/common.sh.in
index 951cb5ce1f3e171e0556830eb9b0cf05932541a5..a117d6fe11729cace35c6a23dc5b814bebe58d18 100644 (file)
--- a/test/common.sh.in
+++ b/test/common.sh.in
@@ -163,9 +163,8 @@ setup_test ()
 {
   MH="${MH_TEST_DIR}/Mail/.mh_profile"
   MHMTSCONF="${MH_INST_DIR}${sysconfdir}/mts.conf"
 {
   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}"
   MH_LIB_DIR="${MH_INST_DIR}${auxexecdir}"

-  export MH MHMTSCONF MH_LIB_DIR PATH
+  export MH MHMTSCONF MH_LIB_DIR

 
   #
   # Only install once
 
   #
   # Only install once


@@ -190,6 +189,9 @@ setup_test ()
         "${MHMTSCONF}.old" >"${MHMTSCONF}"
   fi
 
         "${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
   # clean old test data
   trap "rm -rf '$MH_TEST_DIR/Mail'" 0
   # setup test data