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 79e8d52757ddcdbda5bd6af2ff06fb25f87400a2..0b5cf38277cafcfb088b3729995ed581cb82f422 100755 (executable)
--- a/test/mhshow/test-charset
+++ b/test/mhshow/test-charset
@@ -20,17 +20,8 @@ check_exit '-eq 1' mhshow -
 
 require_locale en_US.UTF-8 en_US.UTF8 en_US.utf-8 en_US.utf8
 
-iconv_elides_question_marks=0
-if test "$ICONV_ENABLED" -eq 0; then
-    text_size=10
-else
-    text_size=11
-    #### 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  &&
-        iconv_elides_question_marks=1
-fi
+text_size=10
+test "$ICONV_ENABLED" -eq 1 && text_size=11
 
 expected=$MH_TEST_DIR/$$.expected
 actual=$MH_TEST_DIR/$$.actual
@@ -144,15 +135,7 @@ MIME-Version: 1.0
 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
-    echo 'iconv complaint not found'
-    sed -n l "$actual"
-    failed=1
-fi
+check "$expected" "$actual"
 
 finish_test
 exit $failed