X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/f66fd42c75d104cdde28cc23de02bf4ddaf95d15..e88901284d9f76832b619ec0b7281f1163154588:/test/mhshow/test-charset

diff --git a/test/mhshow/test-charset b/test/mhshow/test-charset
index d8f176d3..72aeb79e 100755
--- a/test/mhshow/test-charset
+++ b/test/mhshow/test-charset
@@ -25,13 +25,12 @@ if test "$ICONV_ENABLED" -eq 0; then
     text_size=10
 else
     text_size=11
-    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.
+    #### 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 '\344' | iconv -f EBCDIC-US -t UTF-8 >/dev/null 2>&1  ||
         skip_param_value_checks=1
-    fi
 fi
 
 expected=$MH_TEST_DIR/$$.expected
@@ -83,6 +82,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 +121,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 +143,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