Restored test-ali to its prior condition. It failed on the

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

diff --git a/test/scan/test-scan-multibyte b/test/scan/test-scan-multibyte
index 1e9349a09163476e360554be40aae00b856a5bbc..2650d12443b40815d59926974ef0df6f8a2e2588 100755 (executable)
--- a/test/scan/test-scan-multibyte
+++ b/test/scan/test-scan-multibyte
@@ -72,7 +72,13 @@ fi
 scan -width 80 +inbox 11 > $actual || exit 1
 check "$expected" "$actual"
 
 scan -width 80 +inbox 11 > $actual || exit 1
 check "$expected" "$actual"
 

-# check decoding with an invalid multibyte sequence
+#
+# Check decoding with an invalid multibyte sequence.  We skip this test
+# if we don't have iconv support, since it requires converting from one
+# character set to another.  Be sure we created the test file, though, because
+# it's required for the test right after it.
+#
+

 cat >`mhpath new` <<EOF
 From: Test12 <test12@example.com>
 To: Some User <user@example.com>
 cat >`mhpath new` <<EOF
 From: Test12 <test12@example.com>
 To: Some User <user@example.com>


@@ -89,8 +95,10 @@ 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
 

-LC_CTYPE=ISO-8859-1 MM_CHARSET=ISO-8859-1 scan -width 75 last >"$actual"
-check "$expected" "$actual"
+if test "$ICONV_ENABLED" -eq 1; then
+    LC_CTYPE=ISO-8859-1 MM_CHARSET=ISO-8859-1 scan -width 75 last >"$actual"
+    check "$expected" "$actual"
+fi

 
 # check scan width with a valid multibyte sequence
 cat >"$expected" <<EOF
 
 # check scan width with a valid multibyte sequence
 cat >"$expected" <<EOF