X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/2e857ecade62ec99c49386cf4f670c18f4be232b..77f9d39a364f011271ed558e7fcb7008dbc65548:/test/common.sh.in

diff --git a/test/common.sh.in b/test/common.sh.in
index 4cf06e28..328d1ee8 100644
--- a/test/common.sh.in
+++ b/test/common.sh.in
@@ -23,7 +23,7 @@ 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
+unset MAILDROP MHBUILD MHCONTEXT MHMTSUSERCONF MHN MHSHOW MHSTORE
 unset MHLDEBUG MHPDEBUG MHWDEBUG PAGER
 #### Set LC_ALL in individual tests as needed.  Unset these so
 #### that we don't depend on user's settings in other tests.
@@ -266,7 +266,7 @@ setup_test ()
   export PATH
 
   # clean old test data
-  trap "rm -rf '$MH_TEST_DIR/Mail'" 0
+  trap "cd $MH_TEST_DIR; rm -rf '$MH_TEST_DIR/Mail'" 0
   # setup test data
   mkdir -p "$MH_TEST_DIR/Mail" || exit 1
   cat > "$MH" <<EOF || exit 1