X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/8176fc3c191d474c0f0768fdf4305a58eacbd9fc..b3496a6cccc205e49560cb5a8147fce3fc0fcc70:/test/common.sh.in

diff --git a/test/common.sh.in b/test/common.sh.in
index 6a1740c2..2264d469 100644
--- a/test/common.sh.in
+++ b/test/common.sh.in
@@ -21,9 +21,13 @@ export MULTIBYTE_ENABLED ICONV_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 MHBUILD MHCONTEXT MHMTSUSERCONF MHN MHSHOW MHSTORE
 unset MHLDEBUG MHPDEBUG MHWDEBUG MM_CHARSET PAGER
 
+#### Use a test dir for tmp files when MHTMPDIR applies.
+MHTMPDIR=$MH_TEST_DIR/Mail
+export MHTMPDIR
+
 output_md5()
 {
   #### Output just the checksum.  If the filename needs to appear on
@@ -90,7 +94,7 @@ if [ -t 1 ] ; then
     # note \r so next update will overwrite
     printf '%3d%%\r' $PERC
   }
-  
+
   progress_done ()
   {
     printf '100%%\n'
@@ -134,7 +138,7 @@ check() {
       rm -f "$2"
     else
       echo
-      diff -c "$1" "$2"
+      diff -c "$1" "$2" || true
       echo
       echo "$0: test failed, outputs are in $1 and $2."
       failed=`expr ${failed:-0} + 1`
@@ -163,19 +167,14 @@ 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
   #
   if [ -d "${MH_INST_DIR}${bindir}" ]; then
-    if [ -f $MH_INST_DIR/$prefix/bin/folder ]; then
-      :
-    else
-      echo 'installation not finished!'
-    fi
+    :
   else
     (cd "${MH_OBJ_DIR}" &&
       make DESTDIR="${MH_INST_DIR}" SETGID_MAIL= install) ||
@@ -194,10 +193,14 @@ setup_test ()
         "${MHMTSCONF}.old" >"${MHMTSCONF}"
   fi
 
+  #### On Solaris, must set PATH after the install!
+  PATH="${MH_INST_DIR}${bindir}:${PATH}"
+  export PATH
+
   # clean old test data
   trap "rm -rf '$MH_TEST_DIR/Mail'" 0
   # setup test data
-  mkdir "$MH_TEST_DIR/Mail" || exit 1
+  mkdir -p "$MH_TEST_DIR/Mail" || exit 1
   cat > "$MH" <<EOF || exit 1
 Path: ${MH_TEST_DIR}/Mail
 buildmimeproc: ${MH_INST_DIR}${bindir}/mhbuild