test-charset: Fix test when HAVE_ICONV is false.

[nmh] / test / mhshow / test-charset

diff --git a/test/mhshow/test-charset b/test/mhshow/test-charset
index 5414c9a9248b721f8e6c1fd6a42f2bab9ef11819..0b5cf38277cafcfb088b3729995ed581cb82f422 100755 (executable)
--- a/test/mhshow/test-charset
+++ b/test/mhshow/test-charset
@@ -20,18 +20,8 @@ check_exit '-eq 1' mhshow -
 
 require_locale en_US.UTF-8 en_US.UTF8 en_US.utf-8 en_US.utf8
 
-skip_param_value_checks=0
-if test "$ICONV_ENABLED" -eq 0; then
-    text_size=10
-else
-    text_size=11
-    #### For unknown reasons, the parameter values checks fail on the
-    #### FreeBSD10 buildbot.  It doesn't support EBCDIC-US, which is used
-    #### by the checks, so check for that.  Though that doesn't seem to be
-    #### the reason.
-    printf '\0344' | iconv -f EBCDIC-US -t UTF-8 >/dev/null 2>&1  ||
-        skip_param_value_checks=1
-fi
+text_size=10
+test "$ICONV_ENABLED" -eq 1 && text_size=11
 
 expected=$MH_TEST_DIR/$$.expected
 actual=$MH_TEST_DIR/$$.actual
@@ -82,24 +72,23 @@ run_prog mhshow $msgnum > $actual 2>&1
 check "$expected" "$actual" : locale profile component
 
 
-if test $skip_param_value_checks -eq 1; then
-    finish_test
-    exit $failed
-fi
-
+#### RFC 2231 defines the extended value syntax:
+#### extended-initial-value := [charset] "'" [language] "'"
+####                           extended-other-values
+#### used below, where language is blank.
 
 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().
+#### Use a charset to exercise the iconv code, if it's available,
+#### in get_param_value().  The Content-Type charset is UTF-8, encoded
+#### to exercise iconv.
 cat > $msgfile <<EOF
 From: foo@example.edu
 To: bar@example.edu
 Subject: test
 MIME-Version: 1.0
-Content-Type: text/plain; charset*=EBCDIC-US''%e4%e3%c6%60%f8
+Content-Type: text/plain; charset*=ISO-2022-KR''%1b%24%29%43%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
@@ -121,8 +110,10 @@ Content-Description: bogus quoted-printable data
 4 ÷ 2 = 2
 EOF
 
-run_prog mhshow $msgnum > $actual 2>&1
-check "$expected" "$actual" : encoded parameter value
+if test "$ICONV_ENABLED" -eq 1; then
+    run_prog mhshow $msgnum > $actual 2>&1
+    check "$expected" "$actual" : encoded parameter value
+fi
 
 
 start_test 'replacement character in parameter value'
@@ -146,6 +137,5 @@ EOF
 run_prog mhshow $msgnum > $actual 2>&1
 check "$expected" "$actual"
 
-
 finish_test
 exit $failed