Try to fix Encoded parameter value test on FreeBSD10 buildbot.

[nmh] / test / mhshow / test-charset

diff --git a/test/mhshow/test-charset b/test/mhshow/test-charset
index 39f52a67c08f0d83dcc7508a3e010205601cba04..cb16f79893ed89ddbc80c5e8f83eca7f8136e3e7 100755 (executable)
--- a/test/mhshow/test-charset
+++ b/test/mhshow/test-charset
@@ -16,8 +16,9 @@ fi
 
 setup_test
 
-require_locale en_US.utf8
-LC_ALL=en_US.UTF-8; export LC_ALL
+check_exit '-eq 1' mhshow -
+
+require_locale en_US.UTF-8 en_US.UTF8 en_US.utf-8 en_US.utf8
 
 test "$ICONV_ENABLED" -eq 0  &&  text_size=10  || text_size=11
 
@@ -27,6 +28,7 @@ actual=$MH_TEST_DIR/$$.actual
 echo 'mhshow-charset-windows-1252: echo "This is a test"' >> "$MH"
 
 # Write message with bogus quoted-printable data.
+start_test 'Write message with bogus quoted-printable data'
 msgfile=`mhpath new`
 msgnum=`basename $msgfile`
 cat > $msgfile <<EOF
@@ -43,6 +45,7 @@ Date: Sun, 18 Dec 2005 00:52:39 +0100
 EOF
 
 cat > $expected <<EOF
+[ Message inbox:11 ]
 Date:    Sun, 18 Dec 2005 00:52:39 +0100
 To:      bar@example.edu
 From:    foo@example.edu
@@ -55,7 +58,77 @@ Content-Description: bogus quoted-printable data
 This is a test
 EOF
 
+run_prog mhshow $msgnum > $actual 2>&1
+check "$expected" "$actual" 'keep first' : bogus quoted-printable data
+
+
+start_test 'locale profile component'
+#### Used LC_ALL above, now use locale profile component instead.
+printf "locale: $LC_ALL\n" >> "${MH}"
+unset LC_ALL
+
+run_prog mhshow $msgnum > $actual 2>&1
+check "$expected" "$actual" : locale profile component
+
+
+start_test 'Encoded parameter value'
+msgfile=`mhpath new`
+msgnum=`basename $msgfile`
+#### The encoded charset name is really UTF-8 encoded,
+#### but say it's UTF-16 to exercise the iconv code,
+#### if it's available, in get_param_value().
+cat > $msgfile <<EOF
+From: foo@example.edu
+To: bar@example.edu
+Subject: test
+MIME-Version: 1.0
+Content-Type: text/plain; charset*=UTF-16''%55%54%46%2d%38
+Content-Transfer-Encoding: quoted-printable
+Content-Description: bogus quoted-printable data
+Date: Sun, 18 Dec 2005 00:52:39 +0100
+
+4 =C3=B7 2 =3D 2
+EOF
+
+cat > $expected <<EOF
+[ Message inbox:12 ]
+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 - bogus quoted-printable data  11B  ]
+4 ÷ 2 = 2
+EOF
+
+run_prog mhshow $msgnum > $actual 2>&1
+check "$expected" "$actual" : encoded parameter value
+
+
+start_test 'replacement character in parameter value'
+#### The output of this test doesn't show it, but it covers the
+#### noiconv: portion of get_param_value().
+cat > $msgfile <<'EOF'
+Subject: invalid parameter value charset
+MIME-Version: 1.0
+Content-Type: text/plain; charset*=invalid''%0Dus-ascii
+EOF
+
+cat > $expected <<EOF
+[ Message inbox:12 ]
+Subject: invalid parameter value charset
+
+MIME-Version: 1.0
+
+[ part  - text/plain -   0B  ]
+EOF
+
 run_prog mhshow $msgnum > $actual 2>&1
 check "$expected" "$actual"
 
+
+finish_test
 exit $failed