mhshow/test-charset: Test iconv(1)'s result, not just its exit status.

[nmh] / test / mhshow / test-charset

diff --git a/test/mhshow/test-charset b/test/mhshow/test-charset
index 6c7095ff093a455680ad21fac4636f96c16ad34f..8f199678cda5c4c5ad30cebf6602a24d23695a9e 100755 (executable)
--- a/test/mhshow/test-charset
+++ b/test/mhshow/test-charset
@@ -29,7 +29,8 @@ else
     #### 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.
     #### 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 '\xe4' | iconv -f EBCDIC-US -t UTF-8 >/dev/null 2>&1  &&
+    utf8="`printf '\344' | iconv -f EBCDIC-US -t UTF-8 2>/dev/null`" &&
+    test x"$utf8" = xU ||

         skip_param_value_checks=1
 fi
 
         skip_param_value_checks=1
 fi
 


@@ -82,6 +83,12 @@ run_prog mhshow $msgnum > $actual 2>&1
 check "$expected" "$actual" : locale profile component
 
 
 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`
 start_test 'Encoded parameter value'
 msgfile=`mhpath new`
 msgnum=`basename $msgfile`


@@ -115,10 +122,8 @@ Content-Description: bogus quoted-printable data
 4 ÷ 2 = 2
 EOF
 
 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'
 
 
 start_test 'replacement character in parameter value'


@@ -139,10 +144,8 @@ MIME-Version: 1.0
 [ part  - text/plain -   0B  ]
 EOF
 
 [ 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
 
 
 finish_test