X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/f81046da683a14b2265a501f0de00df264a77413..19c69cf39d0ab9aee0cf45caa13d39edf1997fef:/test/mhshow/test-charset diff --git a/test/mhshow/test-charset b/test/mhshow/test-charset index e87f0a51..63efcdd5 100755 --- 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 @@ -126,8 +117,6 @@ fi start_test 'replacement character in parameter value' -#### The output of this test doesn't show it, but it covers the -#### noiconv: portion of get_param_value(). cat > $msgfile <<'EOF' Subject: invalid parameter value charset MIME-Version: 1.0 @@ -144,12 +133,7 @@ MIME-Version: 1.0 EOF run_prog mhshow $msgnum > $actual 2>&1 -if [ $iconv_elides_question_marks -eq 1 ]; then - check "$expected" "$actual" -else - grep "Can't convert .*us-ascii to UTF-8" "$actual" >/dev/null || failed=1 -fi - +check "$expected" "$actual" finish_test exit $failed