X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/13a5e00431c2452d008e5ea797958bb187c1f985..e99539ae6376c4b33e1a23f2ce50830c0d107786:/test/scan/test-scan-multibyte

diff --git a/test/scan/test-scan-multibyte b/test/scan/test-scan-multibyte
index 9be8acb0..76b0a8c7 100755
--- a/test/scan/test-scan-multibyte
+++ b/test/scan/test-scan-multibyte
@@ -98,13 +98,13 @@ 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.
 EOF
 
-cat >"$expected" <<EOF
+if test "$ICONV_ENABLED" -eq 1; then
+    cat >"$expected" <<EOF
   12  12/31 Test12             2013 New Year?s Deals! Start the year right
 EOF
 
-if test "$ICONV_ENABLED" -eq 1; then
     # 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,7 +132,7 @@ 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"
 
 
@@ -153,7 +153,7 @@ 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"
+LC_ALL=en_US.ISO8859-1 scan -width 80 last >"$actual"
 check "$expected" "$actual"