summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph M. Becker <cmbecker69@gmx.de>2016-11-25 23:16:18 +0100
committerChristoph M. Becker <cmbecker69@gmx.de>2016-11-25 23:16:18 +0100
commitbc979aee6d912bd4c15dfa4e68df4f5011ae4b87 (patch)
tree90f986140149b8fc0ab06700ba3d469d40c01758
parenta36dd1dfd8cf807d31aa9acc2f092b532a45bb15 (diff)
parent7f529e3dee032d5977166c3eb7b70f57edc8e562 (diff)
downloadphp-git-bc979aee6d912bd4c15dfa4e68df4f5011ae4b87.tar.gz
Merge branch 'PHP-5.6' into PHP-7.0
-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