Handle the case in the test suite where wcwidth() can return different

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

diff --git a/test/scan/test-scan-multibyte b/test/scan/test-scan-multibyte
index 39f22240213411660172479935e32a0d09821380..1e9349a09163476e360554be40aae00b856a5bbc 100755 (executable)
--- a/test/scan/test-scan-multibyte
+++ b/test/scan/test-scan-multibyte
@@ -31,22 +31,43 @@ LC_ALL=en_US.UTF-8; export LC_ALL
 #
 # Create a test message with RFC 2047 headers we can scan
 #
 #
 # Create a test message with RFC 2047 headers we can scan
 #

+# In this Subject header in this message is a "n" with a Combining Diaeresis
+# (U+0308).  There is different interpretation of this character with respect
+# to wcwidth() (which is supposed to return the column width of a character).
+# We use a test program to determine what the output width of U+0308 is
+# and adjust our test output appropriately.
+#

 
 cat > "${MH_TEST_DIR}/Mail/inbox/11" <<EOF
 From: David =?utf-8?q?=EF=AC=86?= Hubbins <hubbins@example.com>
 To: Sir Denis =?utf-8?q?Eton=E2=80=93Hogg? <sirdenis@example.com>
 Date: Friday, 2 Mar 1984 00:00:00
 
 cat > "${MH_TEST_DIR}/Mail/inbox/11" <<EOF
 From: David =?utf-8?q?=EF=AC=86?= Hubbins <hubbins@example.com>
 To: Sir Denis =?utf-8?q?Eton=E2=80=93Hogg? <sirdenis@example.com>
 Date: Friday, 2 Mar 1984 00:00:00

-Subject: =?utf-8?q?Spin=CC=88al_Tap_=E2=86=92_Tap_into_America!?=
+Subject: =?utf-8?q?Sp=C4=B1n=CC=88al_Tap_=E2=86=92_Tap_into_America!?=

 
 Things are looking great!
 EOF
 
 
 Things are looking great!
 EOF
 

+width=`${MH_OBJ_DIR}/test/getcwidth`
+if test $? -ne 0; then
+    echo "getcwidth failed to run"
+    exit 1
+fi
+

 expected="$MH_TEST_DIR/$$.expected"
 actual="$MH_TEST_DIR/$$.actual"
 
 expected="$MH_TEST_DIR/$$.expected"
 actual="$MH_TEST_DIR/$$.actual"
 

+if test "$width" -eq 1; then

 cat > "$expected" <<EOF
 cat > "$expected" <<EOF

-  11  03/02 David st Hubbins    Spin̈al Tap → Tap into America!<<Things are look
+  11  03/02 David st Hubbins    Spın̈al Tap → Tap into America!<<Things are look

 EOF
 EOF

+elif test "$width" -eq 0; then
+cat > "$expected" <<EOF
+  11  03/02 David st Hubbins    Spın̈al Tap → Tap into America!<<Things are looki
+EOF
+else
+    echo "Unsupported width for combining diaeresis: $width"
+    exit 1
+fi

 
 scan -width 80 +inbox 11 > $actual || exit 1
 check "$expected" "$actual"
 
 scan -width 80 +inbox 11 > $actual || exit 1
 check "$expected" "$actual"