test-charset: Divulge mhshow output if iconv_open(3) doesn't gripe.

[nmh] / test / mhshow / test-charset

diff --git a/test/mhshow/test-charset b/test/mhshow/test-charset
index 013499a27b06ee76a25b37a2fd69827566937012..79e8d52757ddcdbda5bd6af2ff06fb25f87400a2 100755 (executable)
--- a/test/mhshow/test-charset
+++ b/test/mhshow/test-charset
@@ -28,7 +28,7 @@ else
     #### The GNU iconv library normalises charset names by eliding '?', along
     #### with some other characters.  The iconv library used on FreeBSD/NetBSD
     #### doesn't.
-    printf x | iconv -f ?UTF-8 -t UTF-8 >/dev/null 2>&1  &&
+    printf x | iconv -f '?UTF-8' -t UTF-8 >/dev/null 2>&1  &&
         iconv_elides_question_marks=1
 fi
 
@@ -90,13 +90,14 @@ start_test 'Encoded parameter value'
 msgfile=`mhpath new`
 msgnum=`basename $msgfile`
 #### Use a charset to exercise the iconv code, if it's available,
-#### in get_param_value().
+#### 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
@@ -118,8 +119,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'
@@ -143,10 +146,13 @@ EOF
 run_prog mhshow $msgnum > $actual 2>&1
 if [ $iconv_elides_question_marks -eq 1 ]; then
     check "$expected" "$actual"
+elif grep "Can't convert .*us-ascii to UTF-8" "$actual" >/dev/null; then
+    :
 else
-    grep "Can't convert .*us-ascii to UTF-8" "$actual" >/dev/null  ||  failed=1
+    echo 'iconv complaint not found'
+    sed -n l "$actual"
+    failed=1
 fi
 
-
 finish_test
 exit $failed