summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2016-11-25 23:27:13 +0100
committerChristoph M. Becker <cmbecker69@gmx.de>2016-11-25 23:27:13 +0100
commit51ba53ed0fe761b15950f8b07af2381ad54cdb02 (patch)
tree2b80bdae462fb2b70cfc840be519f66635f05827
parentc26e96a05d3fcdb13a7bbe8551155ca2f820e3a3 (diff)
parentbc979aee6d912bd4c15dfa4e68df4f5011ae4b87 (diff)
downloadphp-git-51ba53ed0fe761b15950f8b07af2381ad54cdb02.tar.gz
Merge branch 'PHP-7.0' into 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