X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/8884d1baae25b585efbb3c34515a2d1a198ba847..e6917522:/test/common.sh.in?ds=inline

diff --git a/test/common.sh.in b/test/common.sh.in
index 13db440a..328d1ee8 100644
--- a/test/common.sh.in
+++ b/test/common.sh.in
@@ -14,6 +14,7 @@ test -z "$bindir"  &&  bindir="@bindir@"
 test -z "$mandir"  &&  mandir="@mandir@"
 test -z "$sysconfdir"  &&  sysconfdir="@sysconfdir@"
 test -z "$supported_locks"  &&  supported_locks="@supported_locks@"
+test -z "$default_locking"  &&  default_locking="@default_locking@"
 test -z "$MULTIBYTE_ENABLED"  &&  MULTIBYTE_ENABLED="@MULTIBYTE_ENABLED@"
 test -z "$ICONV_ENABLED"  &&  ICONV_ENABLED="@ICONV_ENABLED@"
 export MH_TEST_DIR auxexecdir bindir mandir sysconfdir
@@ -22,8 +23,11 @@ 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 MHLDEBUG MHPDEBUG MHWDEBUG MM_CHARSET PAGER
+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.
+unset LANG LC_ALL LC_TYPE
 
 #### Use a test dir for tmp files when MHTMPDIR applies.
 MHTMPDIR=$MH_TEST_DIR/Mail
@@ -262,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