From: Ken Hornstein <kenh@pobox.com>
Date: Tue, 6 Sep 2016 00:32:03 +0000 (-0400)
Subject: Merge branch 'xoauth'
X-Git-Url: https://diplodocus.org/git/nmh/commitdiff_plain/6b6847272dc5d21ca6fcd23bf20e16193b226c0a?ds=inline;hp=--cc

Merge branch 'xoauth'
---

6b6847272dc5d21ca6fcd23bf20e16193b226c0a
diff --cc test/common.sh.in
index ae916194,7a4fc7aa..b2c7a7d7
--- a/test/common.sh.in
+++ b/test/common.sh.in
@@@ -25,14 -26,16 +26,23 @@@ test -z "$supported_locks"  &&  support
  test -z "$default_locking"  &&  default_locking="@default_locking@"
  test -z "$MULTIBYTE_ENABLED"  &&  MULTIBYTE_ENABLED="@MULTIBYTE_ENABLED@"
  test -z "$ICONV_ENABLED"  &&  ICONV_ENABLED="@ICONV_ENABLED@"
+ test -z "$OAUTH_SUPPORT"  &&  OAUTH_SUPPORT="@OAUTH_SUPPORT@"
+ test -z "$CURL_USER_AGENT"  &&  CURL_USER_AGENT="@CURL_USER_AGENT@"
+ 
+ #### 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
  
 +#### 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
  #### Set LC_ALL in individual tests as needed.  Unset these so