Move things around so you can still initialize netsec with SASL

[nmh] / test / common.sh.in

diff --git a/test/common.sh.in b/test/common.sh.in
index 7a4fc7aad0af8d07e52ae9bd1db85cdfef70fc78..4843a2409cdfd427ffa789924f93b972e8264ca5 100644 (file)
--- a/test/common.sh.in
+++ b/test/common.sh.in
@@ -36,8 +36,15 @@ test -z "$HOME"  &&  HOME=$MH_TEST_DIR
 HOME=$MH_TEST_DIR
 export HOME
 
+#### If w3m is used, HOME needs to be set, assuming default w3m config.
+#### So make sure that HOME is set to avoid run-time warning about not
+#### being able to create config directory.
+test -z "$HOME"  &&  HOME=$MH_TEST_DIR
+HOME=$MH_TEST_DIR
+export HOME
+
 unset MAILDROP MHBUILD MHCONTEXT MHMTSUSERCONF MHN MHSHOW MHSTORE
-unset MHLDEBUG MHPDEBUG MHWDEBUG PAGER
+unset MHLDEBUG MHPDEBUG MHWDEBUG PAGER XOAUTH
 #### 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_CTYPE