X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/afee8ed17a56617618fb7f963b111d7cf0fb56e7..62988984527c450219fd6808946c618280371047:/test/scan/test-scan-multibyte

diff --git a/test/scan/test-scan-multibyte b/test/scan/test-scan-multibyte
index 1e9349a0..3acd1ca1 100755
--- a/test/scan/test-scan-multibyte
+++ b/test/scan/test-scan-multibyte
@@ -70,9 +70,22 @@ else
 fi
 
 scan -width 80 +inbox 11 > $actual || exit 1
+set -x
+oldfailed="${failed:-0}"
 check "$expected" "$actual"
+if test "$oldfailed" -ne "${failed:-0}"; then
+	echo "Complete UTF-8 width table for BMP"
+	${MH_OBJ_DIR}/test/getcwidth --dump
+fi
+set +x
+
+#
+# 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.
+#
 
-# check decoding with an invalid multibyte sequence
 cat >`mhpath new` <<EOF
 From: Test12 <test12@example.com>
 To: Some User <user@example.com>
@@ -89,8 +102,10 @@ cat >"$expected" <<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