Support sending multiple commands at once.

[nmh] / test / mhshow / test-charset

diff --git a/test/mhshow/test-charset b/test/mhshow/test-charset
index 964e1842388e7443a62f4242450e679862e8dcc2..8f199678cda5c4c5ad30cebf6602a24d23695a9e 100755 (executable)
--- a/test/mhshow/test-charset
+++ b/test/mhshow/test-charset
@@ -23,15 +23,15 @@ 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
-    if iconv -l | grep EBCDIC-US >/dev/null; then
-        #### 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 use that to detect whether to skip the check.
-        skip_param_value_checks=1
-    fi
 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.
+    utf8="`printf '\344' | iconv -f EBCDIC-US -t UTF-8 2>/dev/null`" &&
+    test x"$utf8" = xU ||
+        skip_param_value_checks=1
 fi
 
 expected=$MH_TEST_DIR/$$.expected
@@ -83,6 +83,12 @@ 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
+
+
 start_test 'Encoded parameter value'
 msgfile=`mhpath new`
 msgnum=`basename $msgfile`
@@ -116,10 +122,8 @@ Content-Description: bogus quoted-printable data
 4 ÷ 2 = 2
 EOF
 
-if test $skip_param_value_checks -eq 0; then
-    run_prog mhshow $msgnum > $actual 2>&1
-    check "$expected" "$actual" : encoded parameter value
-fi
+run_prog mhshow $msgnum > $actual 2>&1
+check "$expected" "$actual" : encoded parameter value
 
 
 start_test 'replacement character in parameter value'
@@ -140,10 +144,8 @@ MIME-Version: 1.0
 [ part  - text/plain -   0B  ]
 EOF
 
-if test $skip_param_value_checks -eq 0; then
-    run_prog mhshow $msgnum > $actual 2>&1
-    check "$expected" "$actual"
-fi
+run_prog mhshow $msgnum > $actual 2>&1
+check "$expected" "$actual"
 
 
 finish_test