Merge remote-tracking branch 'origin/convertargs'

[nmh] / test / mhshow / test-charset

diff --git a/test/mhshow/test-charset b/test/mhshow/test-charset
index 83363da86de2f1fd6ca091744f53d073dd0df087..6c3c763a263252291ac5bada32dc70a07a849caf 100755 (executable)
--- a/test/mhshow/test-charset
+++ b/test/mhshow/test-charset
@@ -16,6 +16,11 @@ 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
 
@@ -31,24 +36,27 @@ 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
 EOF
 
 cat > $expected <<EOF
+[ Message inbox:11 ]
 Date:    Sun, 18 Dec 2005 00:52:39 +0100
 To:      bar@example.edu
 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
 
-run_prog mhshow -nopause $msgnum > $actual 2>&1
-check "$expected" "$actual"
+run_prog mhshow $msgnum > $actual 2>&1
+check "$expected" "$actual" : bogus quoted-printable data
 
 exit $failed