summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2016-11-25 23:33:02 +0100
committerChristoph M. Becker <cmbecker69@gmx.de>2016-11-25 23:33:02 +0100
commita35359f8b7ae1f05f31d48ff0c77b5b2e1e85109 (patch)
tree36c0c7ab1ab62651d4365eaffe3d8e81d27e53d7
parent6a34065bf03007fadde282900cbe4ddee6c903fe (diff)
parent51ba53ed0fe761b15950f8b07af2381ad54cdb02 (diff)
downloadphp-git-a35359f8b7ae1f05f31d48ff0c77b5b2e1e85109.tar.gz
Merge branch 'PHP-7.1'
-rw-r--r--ext/gd/tests/imagettftext_charmap_order.phpt1
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/gd/tests/imagettftext_charmap_order.phpt b/ext/gd/tests/imagettftext_charmap_order.phpt
index 2be20b7697..221e6b851a 100644
--- a/ext/gd/tests/imagettftext_charmap_order.phpt
+++ b/ext/gd/tests/imagettftext_charmap_order.phpt
@@ -4,6 +4,7 @@ Font charmap order is deterministic based on order in the font, use the selected
<?php
if(!extension_loaded('gd')){ die('skip gd extension not available'); }
if(!function_exists('imagettftext')) die('skip imagettftext() not available');
+ if(gd_info()['JIS-mapped Japanese Font Support']) die('skip JIS-mapped Japanese Font Support not supported');
?>
--FILE--
<?php