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

diff --git a/test/common.sh.in b/test/common.sh.in
index 58297f0..fa8a037 100644
--- a/test/common.sh.in
+++ b/test/common.sh.in
@@ -19,6 +19,8 @@ export MH_TEST_DIR auxexecdir bindir mandir sysconfdir pagerpath
 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
 
 output_md5()
 {
@@ -68,7 +70,7 @@ findprog()
 
 require_prog ()
 {
-  if [ -z `findprog $1` ]; then
+  if [ -z "`findprog $1`" ]; then
     test_skip "missing $1"
   fi
 }
@@ -133,7 +135,7 @@ setup_test ()
   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
+  export MH MHMTSCONF MH_LIB_DIR PATH
 
   #
   # Only install once
@@ -141,11 +143,12 @@ setup_test ()
   if [ -d ${MH_INST_DIR}${bindir} ]; then
     :
   else
-    (cd ${MH_OBJ_DIR} && make DESTDIR=${MH_INST_DIR} install) || exit 1
+    (cd ${MH_OBJ_DIR} && make DESTDIR=${MH_INST_DIR} SETGID_MAIL= install) ||
+      exit 1
   fi
 
   # clean old test data
-  trap "rm -rf $MH_TEST_DIR/Mail; exit \$status" 0
+  trap "rm -rf $MH_TEST_DIR/Mail" 0
   # setup test data
   mkdir $MH_TEST_DIR/Mail || exit 1
   cat > $MH <<EOF || exit 1