X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/2cf4ff9dd2fba77c7f98bbd706b00d2e79a11a3b..7462b86387b3da707e3323cf0c32ad9e533c8040:/test/mhshow/test-charset

diff --git a/test/mhshow/test-charset b/test/mhshow/test-charset
index 964e1842..106d7dbd 100755
--- a/test/mhshow/test-charset
+++ b/test/mhshow/test-charset
@@ -23,15 +23,14 @@ require_locale en_US.UTF-8 en_US.UTF8 en_US.utf-8 en_US.utf8
 skip_param_value_checks=0
 if test "$ICONV_ENABLED" -eq 0; then
     text_size=10
-    if iconv -l | grep EBCDIC-US >/dev/null; then
-        #### 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 use that to detect whether to skip the check.
-        skip_param_value_checks=1
-    fi
 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 '\xe4' | iconv -f EBCDIC-US -t UTF-8 >/dev/null 2>&1  ||
+        skip_param_value_checks=1
 fi
 
 expected=$MH_TEST_DIR/$$.expected