Fix to commit 0d3875d020fb17d34918f5e81ee7f87fbc5d1565: it seems

that only Linux uses the locale name of en_US.utf8, so added check
for the more common en_US.utf-8 to the tests that use it.

diff --git a/test/dist/test-dist b/test/dist/test-dist
index 6c3c80b5ec3521057428ed4a4210209475779c99..155f773301d42900f6926adc096449d4edff0a41 100755 (executable)
--- a/test/dist/test-dist
+++ b/test/dist/test-dist
@@ -388,7 +388,7 @@ run_test 'scan +outbox -width 6 2' '   2 '
 # Check that dist encodes headers using RFC-2047 properly
 #
 
-require_locale en_US.utf8
+require_locale en_US.utf-8 en_US.utf8
 LC_ALL=en_US.UTF-8; export LC_ALL
 
 cat >"$expected" <<EOF

diff --git a/test/mhbuild/test-attach b/test/mhbuild/test-attach
index 8e2edf83c729c9a1f2239c3ad0b467011147ac43..11e055122b6eb78ad7cea7dc20fbab12c2ef75a9 100755 (executable)
--- a/test/mhbuild/test-attach
+++ b/test/mhbuild/test-attach
@@ -14,7 +14,7 @@ fi
 
 setup_test
 
-require_locale en_US.utf8
+require_locale en_US.utf-8 en_US.utf8
 LC_ALL=en_US.UTF-8; export LC_ALL
 
 draft="$MH_TEST_DIR/$$.draft"

diff --git a/test/mhbuild/test-cte b/test/mhbuild/test-cte
index b63f1998f1368648d24380ea231707305f105658..4d7c6d929350363b16a96bce06a153e53ae3f271 100755 (executable)
--- a/test/mhbuild/test-cte
+++ b/test/mhbuild/test-cte
@@ -16,7 +16,7 @@ setup_test
 
 set -e
 
-require_locale en_US.utf8
+require_locale en_US.utf-8 en_US.utf8
 LC_ALL=en_US.UTF-8; export LC_ALL
 
 draft="$MH_TEST_DIR/$$.draft"

diff --git a/test/mhbuild/test-ext-params b/test/mhbuild/test-ext-params
index 4e28ab4719f76644d4f70ffc4ff3d8bbefcf3657..039fe9a900b96b50b1b9e61270a890c418d2de84 100755 (executable)
--- a/test/mhbuild/test-ext-params
+++ b/test/mhbuild/test-ext-params
@@ -14,7 +14,7 @@ fi
 
 setup_test
 
-require_locale en_US.utf8
+require_locale en_US.utf-8 en_US.utf8
 LC_ALL=en_US.UTF-8; export LC_ALL
 
 draft="$MH_TEST_DIR/$$.draft"

diff --git a/test/mhbuild/test-header-encode b/test/mhbuild/test-header-encode
index 7cc25bed6e2332d8c944782ca6b8b8a3d8e15c4a..e96783f6e2b791e5a358832d3b99f98608282f3b 100755 (executable)
--- a/test/mhbuild/test-header-encode
+++ b/test/mhbuild/test-header-encode
@@ -21,7 +21,7 @@ backupname="${MH_TEST_DIR}/`mhparam sbackup`$$"
 #
 # We're going to hardcode UTF-8 for this test.
 #
-require_locale en_US.utf8
+require_locale en_US.utf-8 en_US.utf8
 LC_ALL=en_US.UTF-8; export LC_ALL
 
 #

diff --git a/test/mhbuild/test-utf8-body b/test/mhbuild/test-utf8-body
index 377d6237c3b60542bb15cbe472cac73ce5f35315..1a08a9075ab77102b81d5449d1dec7168eeae1d5 100755 (executable)
--- a/test/mhbuild/test-utf8-body
+++ b/test/mhbuild/test-utf8-body
@@ -19,7 +19,7 @@ testname="${MH_TEST_DIR}/$$"
 expected="$MH_TEST_DIR/$$.expected"
 actual="$MH_TEST_DIR/$$.actual"
 
-require_locale en_US.utf8
+require_locale en_US.utf-8 en_US.utf8
 LC_ALL=en_US.UTF-8; export LC_ALL
 
 #### Rely on sendmail/pipe below to override default mts.

diff --git a/test/mhfixmsg/test-mhfixmsg b/test/mhfixmsg/test-mhfixmsg
index dea2ddc5847fca43411cea941a2b4b5a59eb7f8c..cac5fb84edb95c53940dca65c3de612132346583 100755 (executable)
--- a/test/mhfixmsg/test-mhfixmsg
+++ b/test/mhfixmsg/test-mhfixmsg
@@ -15,7 +15,7 @@ fi
 . "${srcdir}/test/post/test-post-common.sh"
 
 #### Make sure that html-to-text conversion is what we expect.
-require_locale en_US.utf8
+require_locale en_US.utf-8 en_US.utf8
 LC_ALL=en_US.UTF-8; export LC_ALL
 
 expected="$MH_TEST_DIR/test-mhfixmsg$$.expected"

diff --git a/test/mhlist/test-ext-params b/test/mhlist/test-ext-params
index 2e2373e5783a25475caf181a19bfcfa205a22db3..73dcf8830dccdb496452e786d08200cb7244fbea 100755 (executable)
--- a/test/mhlist/test-ext-params
+++ b/test/mhlist/test-ext-params
@@ -16,7 +16,7 @@ fi
 
 setup_test
 
-require_locale en_US.utf8
+require_locale en_US.utf-8 en_US.utf8
 LC_ALL=en_US.UTF-8; export LC_ALL
 
 expected=$MH_TEST_DIR/$$.expected

diff --git a/test/mhshow/test-charset b/test/mhshow/test-charset
index 39f52a67c08f0d83dcc7508a3e010205601cba04..e0a0b6e83440a46c51e213872a3f6e08bbf1c375 100755 (executable)
--- a/test/mhshow/test-charset
+++ b/test/mhshow/test-charset
@@ -16,7 +16,7 @@ fi
 
 setup_test
 
-require_locale en_US.utf8
+require_locale en_US.utf-8 en_US.utf8
 LC_ALL=en_US.UTF-8; export LC_ALL
 
 test "$ICONV_ENABLED" -eq 0  &&  text_size=10  || text_size=11

diff --git a/test/mhshow/test-textcharset b/test/mhshow/test-textcharset
index f21ea56f1f0559e5a55f67dffbe9ca07821efe28..d4d7ef0709ce06c5eb01baca956306c8e8eead8e 100755 (executable)
--- a/test/mhshow/test-textcharset
+++ b/test/mhshow/test-textcharset
@@ -20,7 +20,7 @@ if test "$ICONV_ENABLED" -eq 0; then
   test_skip 'test-textcharset requires that nmh have been built with iconv'
 fi
 
-require_locale en_US.utf8
+require_locale en_US.utf-8 en_US.utf8
 LC_ALL=en_US.UTF-8; export LC_ALL
 
 expected="$MH_TEST_DIR"/$$.expected

diff --git a/test/pick/test-pick b/test/pick/test-pick
index 7c3896ea3c7911ae97273bb519fc6b63a64b8953..4eff47cbbf01fa3b32549fff417de1f0c58d70ad 100755 (executable)
--- a/test/pick/test-pick
+++ b/test/pick/test-pick
@@ -262,7 +262,7 @@ echo 13 >"$expected"
 
 set +e
 
-require_locale en_US.utf8
+require_locale en_US.utf-8 en_US.utf8
 # Don't use run_prog here because it loses the environment setting.
 LC_ALL=en_US.UTF-8 pick -subject foobar 13 >"$actual" 2>&1
 set -e

diff --git a/test/scan/test-scan-multibyte b/test/scan/test-scan-multibyte
index 9dae456e670c18fc9eaedfef444065cfb2bbe24d..f64661413fb24eacbdebbd2286c4492b3c8f40ad 100755 (executable)
--- a/test/scan/test-scan-multibyte
+++ b/test/scan/test-scan-multibyte
@@ -26,7 +26,7 @@ if test "${MULTIBYTE_ENABLED}" -ne 1; then
     test_skip "configure did not detect multibyte support"
 fi
 
-require_locale en_US.utf8
+require_locale en_US.utf-8 en_US.utf8
 LC_ALL=en_US.UTF-8; export LC_ALL
 
 #