Beginning of work to run mhbuild always. A bit more complicated than I

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

diff --git a/test/scan/test-scan-multibyte b/test/scan/test-scan-multibyte
index 9be8acb0812d7f65e49c2d0ed64c682c273aae81..c78a4d2e0fc45b0560cd1d3840f5b07691a8037a 100755 (executable)
--- a/test/scan/test-scan-multibyte
+++ b/test/scan/test-scan-multibyte
@@ -98,11 +98,11 @@ 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"
     check "$expected" "$actual"
@@ -137,7 +137,7 @@ check "$expected" "$actual"
 
 
 cat >"$expected" <<EOF
-  13  01/13 sender@example.co  <<The Subject: is an encoded single quote, 0x92.
+  13  01/13 sender@example.co  ? <<The Subject: is an encoded single quote, 0x9
 EOF
 
 cat >"${MH_TEST_DIR}/Mail/inbox/13" <<EOF
@@ -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_CTYPE=ISO-8859-1 MM_CHARSET=ISO-8859-1 scan -width 80 last >"$actual"
 check "$expected" "$actual"