X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/eda64599934da9e42be4a38cc4dc5c35d4d5d8d9..b66f48b0d0caea86ac3ae5e5044e3340be22f1a6:/test/scan/test-scan-multibyte?ds=sidebyside

diff --git a/test/scan/test-scan-multibyte b/test/scan/test-scan-multibyte
index f093a824..bab76b6c 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
 
-LC_ALL=en_US.UTF-8; export LC_ALL
+require_locale en_US.UTF-8 en_US.UTF8 en_US.utf-8 en_US.utf8
 
 #
 # Create a test message with RFC 2047 headers we can scan
@@ -65,11 +65,11 @@ actual="$MH_TEST_DIR/$$.actual"
 
 if test "$width" -eq 3; then
 cat > "$expected" <<EOF
-  11  03/02 David st Hubbins    Spın̈al Tap → Tap into America!<<Things are look
+  11  03/02 David st Hubbins    Spın̈al Tap → Tap into America!<<Things are looki
 EOF
 elif test "$width" -eq 2; then
 cat > "$expected" <<EOF
-  11  03/02 David st Hubbins    Spın̈al Tap → Tap into America!<<Things are looki
+  11  03/02 David st Hubbins    Spın̈al Tap → Tap into America!<<Things are lookin
 EOF
 else
     echo "Unsupported width for UTF-8 test string: $width"
@@ -94,8 +94,8 @@ Message-Id: 12@test.nmh
 Subject: =?UTF-8?B?MjAxMyBOZXcgWWVhcuKAmXMgRGVhbHMhIFN0YXJ0IHRoZSB5ZWFy?=
 	=?UTF-8?B?IHJpZ2h0IHdpdGggYmlnIHNhdmluZ3M=?=
 
-This message has an encoded Subject with an invalid character for the
-ISO-8859-1 character set, but it (U+2019) is valid UTF-8.
+This message has an encoded Subject with an invalid character for
+single-byte character sets, but it (U+2019) is valid UTF-8.
 EOF
 
 if test "$ICONV_ENABLED" -eq 1; then
@@ -103,8 +103,8 @@ if test "$ICONV_ENABLED" -eq 1; then
   12  12/31 Test12             2013 New Year?s Deals! Start the year right
 EOF
 
-    # Don't use run_prog here because it loses those environment settings.
-    LC_CTYPE=ISO-8859-1 MM_CHARSET=ISO-8859-1 scan -width 75 last >"$actual"
+    # Don't use run_prog here because it loses the environment setting.
+    LC_ALL=C scan -width 74 last >"$actual"
     check "$expected" "$actual"
 fi
 
@@ -132,18 +132,16 @@ else
     echo "Unsupported width for U+2019: $width"
 fi
 
-LC_CTYPE=en_US.UTF-8 MM_CHARSET=UTF-8 scan -width 75 last >"$actual"
+run_prog scan -width 74 last >"$actual"
 check "$expected" "$actual"
 
 
-#### Skip this test if we don't have iconv support because it
-#### requires converting from ISO-8859-1 to UTF-8.
 if test "$ICONV_ENABLED" -eq 1; then
-    cat >"$expected" <<EOF
-  13  01/13 sender@example.co  <<The Subject: is an encoded single quote, 0x92.
+  cat >"$expected" <<EOF
+  13  01/13 sender@example.co  <<The Subject: is an encoded single quote, 0x92. 
 EOF
 
-    cat >"${MH_TEST_DIR}/Mail/inbox/13" <<EOF
+  cat >"${MH_TEST_DIR}/Mail/inbox/13" <<EOF
 From: <sender@example.com>
 Subject: =?iso-8859-1?B?kgo=?=
 Date: Mon, 13 Jan 2014 14:18:33 -0600
@@ -156,8 +154,8 @@ properly count it when decoding, which could be seen with:
 The scan listing was two characters too long.
 EOF
 
-    run_prog scan -width 80 last >"$actual"
-    check "$expected" "$actual"
+  run_prog scan -width 80 last >"$actual"
+  check "$expected" "$actual"
 fi