Fix to commit 0d3875d020fb17d34918f5e81ee7f87fbc5d1565: it seems

[nmh] / test / mhshow / test-charset

diff --git a/test/mhshow/test-charset b/test/mhshow/test-charset
index 64c9812b6d9bb90fbde317c3ea362bba8a16449b..e0a0b6e83440a46c51e213872a3f6e08bbf1c375 100755 (executable)
--- a/test/mhshow/test-charset
+++ b/test/mhshow/test-charset
@@ -16,10 +16,15 @@ fi
 
 setup_test
 
+require_locale en_US.utf-8 en_US.utf8
+LC_ALL=en_US.UTF-8; export LC_ALL
+
+test "$ICONV_ENABLED" -eq 0  &&  text_size=10  || text_size=11
+
 expected=$MH_TEST_DIR/$$.expected
 actual=$MH_TEST_DIR/$$.actual
 
-echo 'mhshow-charset-windows-1252: echo "This is a test"' >> $MH_TEST_DIR/Mail/.mh_profile
+echo 'mhshow-charset-windows-1252: echo "This is a test"' >> "$MH"
 
 # Write message with bogus quoted-printable data.
 msgfile=`mhpath new`
@@ -31,6 +36,7 @@ Subject: test
 MIME-Version: 1.0
 Content-Type: text/plain; charset=windows-1252
 Content-Transfer-Encoding: quoted-printable
+Content-Description: bogus quoted-printable data
 Date: Sun, 18 Dec 2005 00:52:39 +0100
 
 4 =F7 2 =3D 2
@@ -43,12 +49,13 @@ From:    foo@example.edu
 Subject: test
 
 MIME-Version: 1.0
+Content-Description: bogus quoted-printable data
 
-part       text/plain                  10
+[ part  - text/plain - bogus quoted-printable data  ${text_size}B  ]
 This is a test
 EOF
 
-mhshow -nopause $msgnum > $actual 2>&1
+run_prog mhshow $msgnum > $actual 2>&1
 check "$expected" "$actual"
 
 exit $failed