From f839e6a78ff81930c00f8b4509d95e4a3d242e58 Mon Sep 17 00:00:00 2001
From: David Levine <levinedl@acm.org>
Date: Sun, 15 Jun 2014 22:43:16 -0500
Subject: [PATCH] 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.

---
 test/dist/test-dist             | 2 +-
 test/mhbuild/test-attach        | 2 +-
 test/mhbuild/test-cte           | 2 +-
 test/mhbuild/test-ext-params    | 2 +-
 test/mhbuild/test-header-encode | 2 +-
 test/mhbuild/test-utf8-body     | 2 +-
 test/mhfixmsg/test-mhfixmsg     | 2 +-
 test/mhlist/test-ext-params     | 2 +-
 test/mhshow/test-charset        | 2 +-
 test/mhshow/test-textcharset    | 2 +-
 test/pick/test-pick             | 2 +-
 test/scan/test-scan-multibyte   | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/test/dist/test-dist b/test/dist/test-dist
index 6c3c80b5..155f7733 100755
--- 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 8e2edf83..11e05512 100755
--- 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 b63f1998..4d7c6d92 100755
--- 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 4e28ab47..039fe9a9 100755
--- 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 7cc25bed..e96783f6 100755
--- 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 377d6237..1a08a907 100755
--- 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 dea2ddc5..cac5fb84 100755
--- 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 2e2373e5..73dcf883 100755
--- 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 39f52a67..e0a0b6e8 100755
--- 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 f21ea56f..d4d7ef07 100755
--- 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 7c3896ea..4eff47cb 100755
--- 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 9dae456e..f6466141 100755
--- 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
 
 #
-- 
2.56.0