Completely deprecate support for MM_CHARSET.

[nmh] / test / scan / test-scan-multibyte

diff --git a/test/scan/test-scan-multibyte b/test/scan/test-scan-multibyte
index f093a82496ae31c48fc3b2d735cab733a01a8ae5..76b0a8c77391c3fdcb339bacf5b75c1836d2f1cf 100755 (executable)
--- a/test/scan/test-scan-multibyte
+++ b/test/scan/test-scan-multibyte
@@ -104,7 +104,7 @@ if test "$ICONV_ENABLED" -eq 1; then
 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"
+    LC_ALL=en_US.ISO8859-1 scan -width 75 last >"$actual"
     check "$expected" "$actual"
 fi
 
@@ -132,18 +132,15 @@ else
     echo "Unsupported width for U+2019: $width"
 fi
 
-LC_CTYPE=en_US.UTF-8 MM_CHARSET=UTF-8 scan -width 75 last >"$actual"
+LC_ALL=en_US.UTF-8 scan -width 75 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
+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,9 +153,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"
-fi
+LC_ALL=en_US.ISO8859-1 scan -width 80 last >"$actual"
+check "$expected" "$actual"
 
 
 exit $failed