Removed msh relics from scansbr.c, including a global.

[nmh] / test / common.sh.in

diff --git a/test/common.sh.in b/test/common.sh.in
index 67b18a8239d6bce3629b860585b376dab1e80c6c..f4225e1b62c35c85e4d6e459390e0c6f1db20d3b 100644 (file)
--- a/test/common.sh.in
+++ b/test/common.sh.in
@@ -23,11 +23,11 @@ export MULTIBYTE_ENABLED ICONV_ENABLED
 test -z "$MH_INST_DIR"  &&  MH_INST_DIR="${MH_TEST_DIR}/inst"
 export MH_INST_DIR
 
 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.
 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
+unset LANG LC_ALL LC_CTYPE

 
 #### Use a test dir for tmp files when MHTMPDIR applies.
 MHTMPDIR=$MH_TEST_DIR/Mail
 
 #### Use a test dir for tmp files when MHTMPDIR applies.
 MHTMPDIR=$MH_TEST_DIR/Mail


@@ -85,6 +85,18 @@ require_prog ()
   fi
 }
 
   fi
 }
 

+# Skip test if none of the offered locales are supported.
+require_locale ()
+{
+  for locale in "$@"; do
+    if locale -a | grep -i "$locale" >/dev/null; then
+        return
+    fi
+  done
+
+  test_skip "no suitable locale available"
+}
+

 # Some stuff for doing silly progress indicators
 if [ -t 1 ] ; then
   progress_update ()
 # Some stuff for doing silly progress indicators
 if [ -t 1 ] ; then
   progress_update ()