Skip the last check that I added to test-scan-multibyte if we don't

have iconv support because it requires converting from ISO-8859-1 to
UTF-8.

diff --git a/test/scan/test-scan-multibyte b/test/scan/test-scan-multibyte
index 9be8acb0812d7f65e49c2d0ed64c682c273aae81..f093a82496ae31c48fc3b2d735cab733a01a8ae5 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
 
 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
 
   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"
     # 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"


@@ -136,11 +136,14 @@ LC_CTYPE=en_US.UTF-8 MM_CHARSET=UTF-8 scan -width 75 last >"$actual"
 check "$expected" "$actual"
 
 
 check "$expected" "$actual"
 
 

-cat >"$expected" <<EOF
+#### 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.
 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
 From: <sender@example.com>
 Subject: =?iso-8859-1?B?kgo=?=
 Date: Mon, 13 Jan 2014 14:18:33 -0600


@@ -153,8 +156,9 @@ properly count it when decoding, which could be seen with:
 The scan listing was two characters too long.
 EOF
 
 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

 
 
 exit $failed
 
 
 exit $failed