X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/8505e4e08c289ecd1b5d948c92e627d46749d583..fa462ef71fbaf819397c59b2c07adf45a04af9f8:/test/scan/test-scan-multibyte

diff --git a/test/scan/test-scan-multibyte b/test/scan/test-scan-multibyte
index 98dd9a26..db1d3ba7 100755
--- a/test/scan/test-scan-multibyte
+++ b/test/scan/test-scan-multibyte
@@ -37,10 +37,17 @@ LC_ALL=en_US.UTF-8; export LC_ALL
 # We use a test program to determine what the output width of U+0308 is
 # and adjust our test output appropriately.
 #
+# True Spın̈al Tap fans will note that David st Hubbins was born in Squatney,
+# London, England, and thus having his name language-tagged with "cy" is almost
+# certainly incorrect.  But in his own words: "Here lies David st Hubbins,
+# and why not?".
+#
+# The second "* in the To line is just to exercise the parser a bit.
+#
 
 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>
+From: David =?utf-8*cy?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?Sp=C4=B1n=CC=88al_Tap_=E2=86=92_Tap_into_America!?=
 
@@ -69,7 +76,7 @@ else
     exit 1
 fi
 
-scan -width 80 +inbox 11 > $actual || exit 1
+run_prog scan -width 80 +inbox 11 > $actual || exit 1
 check "$expected" "$actual"
 
 #
@@ -96,6 +103,7 @@ cat >"$expected" <<EOF
 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"
 fi
@@ -124,7 +132,7 @@ else
     echo "Unsupported width for U+2019: $width"
 fi
 
-LC_CTYPE=en_US.UTF-8 MM_CHARSET=UTF-8 scan -width 75 last >"$actual"
+LC_CTYPE=en_US.UTF-8 MM_CHARSET=UTF-8 run_prog scan -width 75 last >"$actual"
 check "$expected" "$actual"