X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/d5e78944632398a4e31bca0c43cb4df3b30b1640..c49ef61e9b0cfeaa64c30321955b6e88f3d7aa26:/test/scan/test-scan-multibyte?ds=sidebyside

diff --git a/test/scan/test-scan-multibyte b/test/scan/test-scan-multibyte
index 819c34c0..3acd1ca1 100755
--- a/test/scan/test-scan-multibyte
+++ b/test/scan/test-scan-multibyte
@@ -70,16 +70,23 @@ 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
+# character set to another.  Be sure we created the test file, though, because
+# it's required for the test right after it.
 #
 
-if test "$ICONV_ENABLED" -eq 1; then
-    cat >`mhpath new` <<EOF
+cat >`mhpath new` <<EOF
 From: Test12 <test12@example.com>
 To: Some User <user@example.com>
 Date: Mon, 31 Dec 2012 00:00:00
@@ -91,10 +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
+cat >"$expected" <<EOF
   12  12/31 Test12             2013 New Year?s Deals! Start the year right
 EOF
 
+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