X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/71807b3575bb312a3b650ce7091b02f0285b9aab..e88901284d9f76832b619ec0b7281f1163154588:/test/mhshow/test-charset diff --git a/test/mhshow/test-charset b/test/mhshow/test-charset index 3bcfdffc..72aeb79e 100755 --- a/test/mhshow/test-charset +++ b/test/mhshow/test-charset @@ -20,7 +20,18 @@ check_exit '-eq 1' mhshow - require_locale en_US.UTF-8 en_US.UTF8 en_US.utf-8 en_US.utf8 -test "$ICONV_ENABLED" -eq 0 && text_size=10 || text_size=11 +skip_param_value_checks=0 +if test "$ICONV_ENABLED" -eq 0; then + text_size=10 +else + text_size=11 + #### 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 expected=$MH_TEST_DIR/$$.expected actual=$MH_TEST_DIR/$$.actual @@ -71,9 +82,18 @@ 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` +#### The encoded charset name is really UTF-8 encoded, +#### but say it's UTF-16 to exercise the iconv code, +#### if it's available, in get_param_value(). cat > $msgfile <