com php-src: Skip tests that are supposed to fail due to bugs in old external libgd: ext/gd/tests/bug43121.phpt ext/gd/tests/bug43475.phpt
ext/gd/tests/bug43828.phpt ext/gd/tests/bug53154.phpt ext/gd/tests/bug53640.phpt ext/gd/tests/bug64641.phpt ext/gd/tests/bug66387.phpt
ext/gd/tests/bug67447.phpt ext/gd/tests/bug71912.phpt ext/gd/tests/bug72339.phpt ext/gd/tests/bug72512.phpt ext/gd/tests/bug72512_ 0.phpt
ext/gd/tests/bug72512_1.phpt ext /gd/tes
| From: | Christoph Michael Becker | Date: | Wed, 17 Aug 2016 19:36:26 +0000 |
| Subject: | com php-src: Skip tests that are supposed to fail due to bugs in old external libgd: ext/gd/tests/bug43121.phpt ext/gd/tests/bug43475.phpt ext/gd/tests/bug43828.phpt ext/gd/tests/bug53154.phpt ext/gd/tests/bug53640.phpt ext/gd/tests/bug64641.phpt ext/gd/tests/bug66387.phpt ext/gd/tests/bug67447.phpt ext/gd/tests/bug71912.phpt ext/gd/tests/bug72339.phpt ext/gd/tests/bug72512.phpt ext/gd/tests/bug72512_ 0.phpt ext/gd/tests/bug72512_1.phpt ext /gd/tes |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-93921@lists.php.net to get a copy of this message | ||
Commit: 54293d21cbcd1b3bfee331c7011970e629026523
Author: Christoph M. Becker <cmbecker69@gmx.de> Wed, 17 Aug 2016 14:04:08 +0200
Parents: a3159d29bb24d5c946c14b7aa33e96bebcd56e59
Branches: PHP-5.6 PHP-7..0 PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=54293d21cbcd1b3bfee331c7011970e629026523
Log:
Skip tests that are supposed to fail due to bugs in old external libgd
Changed paths:
M ext/gd/tests/bug43121.phpt
M ext/gd/tests/bug43475.phpt
M ext/gd/tests/bug43828.phpt
M ext/gd/tests/bug53154.phpt
M ext/gd/tests/bug53640.phpt
M ext/gd/tests/bug64641.phpt
M ext/gd/tests/bug66387.phpt
M ext/gd/tests/bug67447.phpt
M ext/gd/tests/bug71912.phpt
M ext/gd/tests/bug72339.phpt
M ext/gd/tests/bug72512.phpt
M ext/gd/tests/bug72512_0.phpt
M ext/gd/tests/bug72512_1.phpt
M ext/gd/tests/github_bug_215.phpt
M ext/gd/tests/imagecolorallocatealpha_basic.phpt
M ext/gd/tests/imagefilledarc_basic.phpt
M ext/gd/tests/imagefilledarc_variation1.phpt
M ext/gd/tests/imagefilledarc_variation2.phpt
M ext/gd/tests/imagegammacorrect_basic.phpt
M ext/gd/tests/imagegammacorrect_variation1.phpt
M ext/gd/tests/imagetruecolortopalette_basic.phpt
diff --git a/ext/gd/tests/bug43121.phpt b/ext/gd/tests/bug43121.phpt index ce2d1d6..feb10267 100644 --- a/ext/gd/tests/bug43121.phpt +++ b/ext/gd/tests/bug43121.phpt @@ -3,6 +3,9 @@ Bug #43121 (gdImageFill with IMG_COLOR_TILED crashes httpd) --SKIPIF-- <?php if (!extension_loaded('gd')) die("skip gd extension not available\n"); + if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.0', '<')) { + die("skip test requires GD 2.2.0 or higher"); + } ?> --FILE-- <?php diff --git a/ext/gd/tests/bug43475.phpt b/ext/gd/tests/bug43475.phpt index b29b980..f0302d4 100644 --- a/ext/gd/tests/bug43475.phpt +++ b/ext/gd/tests/bug43475.phpt @@ -3,6 +3,9 @@ Bug #43475 (Thick styled lines have scrambled patterns) --SKIPIF-- <?php if (!extension_loaded('gd')) die("skip gd extension not available\n"); + if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) { + die("skip test requires GD 2.2.2 or higher"); + } ?> --FILE-- <?php diff --git a/ext/gd/tests/bug43828.phpt b/ext/gd/tests/bug43828.phpt index c43a5c6..43d11ae 100644 --- a/ext/gd/tests/bug43828.phpt +++ b/ext/gd/tests/bug43828.phpt @@ -3,6 +3,9 @@ Bug #43828 (broken transparency of imagearc for truecolor in blendingmode) --SKIPIF-- <?php if (!extension_loaded('gd')) die('skip ext/gd not available'); +if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) { + die("skip test requires GD 2.2.2 or higher"); +} ?> --FILE-- <?php diff --git a/ext/gd/tests/bug53154.phpt b/ext/gd/tests/bug53154.phpt index 6cbae20..0c5ee9c 100644 --- a/ext/gd/tests/bug53154.phpt +++ b/ext/gd/tests/bug53154.phpt @@ -3,6 +3,9 @@ Bug #53154 (Zero-height rectangle has whiskers) --SKIPIF-- <?php if (!extension_loaded('gd')) die('skip gd extension not available'); +if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) { + die("skip test requires GD 2.2.2 or higher"); +} ?> --FILE-- <?php diff --git a/ext/gd/tests/bug53640.phpt b/ext/gd/tests/bug53640.phpt index ee875de..7e8217c 100644 --- a/ext/gd/tests/bug53640.phpt +++ b/ext/gd/tests/bug53640.phpt @@ -3,6 +3,9 @@ Bug #53640 (XBM images require width to be multiple of 8) --SKIPIF-- <?php if (!extension_loaded('gd')) die('skip gd extension not available'); +if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.3', '<')) { + die("skip test requires GD 2.2.3 or higher"); +} ?> --FILE-- <?php diff --git a/ext/gd/tests/bug64641.phpt b/ext/gd/tests/bug64641.phpt index d8dae9a..713daaf 100644 --- a/ext/gd/tests/bug64641.phpt +++ b/ext/gd/tests/bug64641.phpt @@ -3,6 +3,9 @@ Bug #64641 (imagefilledpolygon doesn't draw horizontal line) --SKIPIF-- <?php if (!extension_loaded('gd')) die("skip gd extension not available\n"); +if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) { + die("skip test requires GD 2.2.2 or higher"); +} ?> --FILE-- <?php diff --git a/ext/gd/tests/bug66387.phpt b/ext/gd/tests/bug66387.phpt index 79c49a5..04ab0b6 100644 --- a/ext/gd/tests/bug66387.phpt +++ b/ext/gd/tests/bug66387.phpt @@ -3,6 +3,9 @@ Bug #66387 (Stack overflow with imagefilltoborder) --SKIPIF-- <?php if (!extension_loaded('gd')) die('skip gd extension not available!'); +if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.1', '<')) { + die("skip test requires GD 2.2.1 or higher"); +} ?> --FILE-- <?php diff --git a/ext/gd/tests/bug67447.phpt b/ext/gd/tests/bug67447.phpt index 2caa49b..878b322 100644 --- a/ext/gd/tests/bug67447.phpt +++ b/ext/gd/tests/bug67447.phpt @@ -1,5 +1,11 @@ --TEST-- Bug #67447 (imagecrop() adds a black line when cropping) +--SKIPIF-- +<?php + if (!extension_loaded('gd')) { + die("skip gd extension not available\n"); + } +?> --FILE-- <?php // true color diff --git a/ext/gd/tests/bug71912.phpt b/ext/gd/tests/bug71912.phpt index c86188b..9cb7921 100644 --- a/ext/gd/tests/bug71912.phpt +++ b/ext/gd/tests/bug71912.phpt @@ -3,6 +3,9 @@ Bug #71912 (libgd: signedness vulnerability) --SKIPIF-- <?php if(!extension_loaded('gd')){ die('skip gd extension not available'); } + if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.0', '<')) { + die("skip test requires GD 2.2.0 or higher"); + } if(!function_exists('imagecreatefromgd2')) die('skip imagecreatefromgd2() not available'); ?> --FILE-- diff --git a/ext/gd/tests/bug72339.phpt b/ext/gd/tests/bug72339.phpt index 2c30ee8..c886283 100644 --- a/ext/gd/tests/bug72339.phpt +++ b/ext/gd/tests/bug72339.phpt @@ -1,7 +1,12 @@ --TEST-- Bug #72339 Integer Overflow in _gd2GetHeader() resulting in heap overflow --SKIPIF-- -<?php if (!function_exists("imagecreatefromgd2")) print "skip"; ?> +<?php +if (!function_exists("imagecreatefromgd2")) print "skip"; +if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) { + die("skip test requires GD 2.2.2 or higher"); +} +?> --FILE-- <?php $fname = dirname(__FILE__) . DIRECTORY_SEPARATOR . "bug72339.gd"; diff --git a/ext/gd/tests/bug72512.phpt b/ext/gd/tests/bug72512.phpt index 2a2024d..3f9e219 100644 --- a/ext/gd/tests/bug72512.phpt +++ b/ext/gd/tests/bug72512.phpt @@ -3,6 +3,9 @@ Bug #19366 (gdimagefill() function crashes (fixed in bundled libgd)) --SKIPIF-- <?php if (!extension_loaded('gd')) die("skip gd extension not available\n"); + if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) { + die("skip test requires GD 2.2.2 or higher"); + } ?> --FILE-- <?php diff --git a/ext/gd/tests/bug72512_0.phpt b/ext/gd/tests/bug72512_0.phpt index 5f98662..565d60a 100644 --- a/ext/gd/tests/bug72512_0.phpt +++ b/ext/gd/tests/bug72512_0.phpt @@ -3,6 +3,9 @@ Bug #72512 gdImageTrueColorToPaletteBody allows arbitrary write/read access, var --SKIPIF-- <?php if (!extension_loaded('gd')) die("skip gd extension not available\n"); + if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) { + die("skip test requires GD 2.2.2 or higher"); + } ?> --FILE-- <?php diff --git a/ext/gd/tests/bug72512_1.phpt b/ext/gd/tests/bug72512_1.phpt index bba01a7..2983ff2 100644 --- a/ext/gd/tests/bug72512_1.phpt +++ b/ext/gd/tests/bug72512_1.phpt @@ -3,6 +3,9 @@ Bug #72512 gdImageTrueColorToPaletteBody allows arbitrary write/read access, var --SKIPIF-- <?php if (!extension_loaded('gd')) die("skip gd extension not available\n"); + if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) { + die("skip test requires GD 2.2.2 or higher"); + } ?> --FILE-- <?php diff --git a/ext/gd/tests/github_bug_215.phpt b/ext/gd/tests/github_bug_215.phpt index f44a540..8657f95 100644 --- a/ext/gd/tests/github_bug_215.phpt +++ b/ext/gd/tests/github_bug_215.phpt @@ -3,6 +3,9 @@ Github #215 (imagefilltoborder stack overflow when invalid pallete index used) --SKIPIF-- <?php if (!extension_loaded("gd")) die("skip GD not present"); +if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) { + die("skip test requires GD 2.2.2 or higher"); +} ?> --FILE-- <?php diff --git a/ext/gd/tests/imagecolorallocatealpha_basic.phpt b/ext/gd/tests/imagecolorallocatealpha_basic.phpt index a42c51d..8595b40 100644 --- a/ext/gd/tests/imagecolorallocatealpha_basic.phpt +++ b/ext/gd/tests/imagecolorallocatealpha_basic.phpt @@ -5,6 +5,9 @@ Rafael Dohms <rdohms [at] gmail [dot] com> --SKIPIF-- <?php if (!extension_loaded("gd")) die("skip GD not present"); + if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) { + die("skip test requires GD 2.2.2 or higher"); + } ?> --FILE-- <?php diff --git a/ext/gd/tests/imagefilledarc_basic.phpt b/ext/gd/tests/imagefilledarc_basic.phpt index 4e3bf29..8c76a83 100644 --- a/ext/gd/tests/imagefilledarc_basic.phpt +++ b/ext/gd/tests/imagefilledarc_basic.phpt @@ -6,6 +6,9 @@ Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br> --SKIPIF-- <?php if (!extension_loaded("gd")) die("skip GD not present"); +if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) { + die("skip test requires GD 2.2.2 or higher"); +} ?> --FILE-- <?php diff --git a/ext/gd/tests/imagefilledarc_variation1.phpt b/ext/gd/tests/imagefilledarc_variation1.phpt index 257c898..f4130a9 100644 --- a/ext/gd/tests/imagefilledarc_variation1.phpt +++ b/ext/gd/tests/imagefilledarc_variation1.phpt @@ -6,6 +6,9 @@ Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br> --SKIPIF-- <?php if (!extension_loaded("gd")) die("skip GD not present"); +if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) { + die("skip test requires GD 2.2.2 or higher"); +} ?> --FILE-- <?php diff --git a/ext/gd/tests/imagefilledarc_variation2.phpt b/ext/gd/tests/imagefilledarc_variation2.phpt index c6ccca4..033d6f6 100644 --- a/ext/gd/tests/imagefilledarc_variation2.phpt +++ b/ext/gd/tests/imagefilledarc_variation2.phpt @@ -6,6 +6,9 @@ Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br> --SKIPIF-- <?php if (!extension_loaded("gd")) die("skip GD not present"); +if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) { + die("skip test requires GD 2.2.2 or higher"); +} ?> --FILE-- <?php diff --git a/ext/gd/tests/imagegammacorrect_basic.phpt b/ext/gd/tests/imagegammacorrect_basic.phpt index 0f4a9fd..b803e95 100644 --- a/ext/gd/tests/imagegammacorrect_basic.phpt +++ b/ext/gd/tests/imagegammacorrect_basic.phpt @@ -6,6 +6,9 @@ Rafael Dohms <rdohms [at] gmail [dot] com> --SKIPIF-- <?php if (!extension_loaded("gd")) die("skip GD not present"); + if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) { + die("skip test requires GD 2.2.2 or higher"); + } ?> --FILE-- <?php diff --git a/ext/gd/tests/imagegammacorrect_variation1.phpt b/ext/gd/tests/imagegammacorrect_variation1.phpt index f022d1d..a0df819 100644 --- a/ext/gd/tests/imagegammacorrect_variation1.phpt +++ b/ext/gd/tests/imagegammacorrect_variation1.phpt @@ -6,6 +6,9 @@ Rafael Dohms <rdohms [at] gmail [dot] com> --SKIPIF-- <?php if (!extension_loaded("gd")) die("skip GD not present"); + if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) { + die("skip test requires GD 2.2.2 or higher"); + } ?> --FILE-- <?php diff --git a/ext/gd/tests/imagetruecolortopalette_basic.phpt b/ext/gd/tests/imagetruecolortopalette_basic.phpt index bbc1277..e7b3274 100644 --- a/ext/gd/tests/imagetruecolortopalette_basic.phpt +++ b/ext/gd/tests/imagetruecolortopalette_basic.phpt @@ -5,6 +5,9 @@ Rafael Dohms <rdohms [at] gmail [dot] com> --SKIPIF-- <?php if (!extension_loaded("gd")) die("skip GD not present"); + if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) { + die("skip test requires GD 2.2.2 or higher"); + } if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible"); ?> --FILE--
diff --git a/ext/gd/tests/bug43121.phpt b/ext/gd/tests/bug43121.phpt index ce2d1d6..feb10267 100644 --- a/ext/gd/tests/bug43121.phpt +++ b/ext/gd/tests/bug43121.phpt @@ -3,6 +3,9 @@ Bug #43121 (gdImageFill with IMG_COLOR_TILED crashes httpd) --SKIPIF-- <?php if (!extension_loaded('gd')) die("skip gd extension not available\n"); + if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.0', '<')) { + die("skip test requires GD 2.2.0 or higher"); + } ?> --FILE-- <?php diff --git a/ext/gd/tests/bug43475.phpt b/ext/gd/tests/bug43475.phpt index b29b980..f0302d4 100644 --- a/ext/gd/tests/bug43475.phpt +++ b/ext/gd/tests/bug43475.phpt @@ -3,6 +3,9 @@ Bug #43475 (Thick styled lines have scrambled patterns) --SKIPIF-- <?php if (!extension_loaded('gd')) die("skip gd extension not available\n"); + if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) { + die("skip test requires GD 2.2.2 or higher"); + } ?> --FILE-- <?php diff --git a/ext/gd/tests/bug43828.phpt b/ext/gd/tests/bug43828.phpt index c43a5c6..43d11ae 100644 --- a/ext/gd/tests/bug43828.phpt +++ b/ext/gd/tests/bug43828.phpt @@ -3,6 +3,9 @@ Bug #43828 (broken transparency of imagearc for truecolor in blendingmode) --SKIPIF-- <?php if (!extension_loaded('gd')) die('skip ext/gd not available'); +if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) { + die("skip test requires GD 2.2.2 or higher"); +} ?> --FILE-- <?php diff --git a/ext/gd/tests/bug53154.phpt b/ext/gd/tests/bug53154.phpt index 6cbae20..0c5ee9c 100644 --- a/ext/gd/tests/bug53154.phpt +++ b/ext/gd/tests/bug53154.phpt @@ -3,6 +3,9 @@ Bug #53154 (Zero-height rectangle has whiskers) --SKIPIF-- <?php if (!extension_loaded('gd')) die('skip gd extension not available'); +if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) { + die("skip test requires GD 2.2.2 or higher"); +} ?> --FILE-- <?php diff --git a/ext/gd/tests/bug53640.phpt b/ext/gd/tests/bug53640.phpt index ee875de..7e8217c 100644 --- a/ext/gd/tests/bug53640.phpt +++ b/ext/gd/tests/bug53640.phpt @@ -3,6 +3,9 @@ Bug #53640 (XBM images require width to be multiple of 8) --SKIPIF-- <?php if (!extension_loaded('gd')) die('skip gd extension not available'); +if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.3', '<')) { + die("skip test requires GD 2.2.3 or higher"); +} ?> --FILE-- <?php diff --git a/ext/gd/tests/bug64641.phpt b/ext/gd/tests/bug64641.phpt index d8dae9a..713daaf 100644 --- a/ext/gd/tests/bug64641.phpt +++ b/ext/gd/tests/bug64641.phpt @@ -3,6 +3,9 @@ Bug #64641 (imagefilledpolygon doesn't draw horizontal line) --SKIPIF-- <?php if (!extension_loaded('gd')) die("skip gd extension not available\n"); +if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) { + die("skip test requires GD 2.2.2 or higher"); +} ?> --FILE-- <?php diff --git a/ext/gd/tests/bug66387.phpt b/ext/gd/tests/bug66387.phpt index 79c49a5..04ab0b6 100644 --- a/ext/gd/tests/bug66387.phpt +++ b/ext/gd/tests/bug66387.phpt @@ -3,6 +3,9 @@ Bug #66387 (Stack overflow with imagefilltoborder) --SKIPIF-- <?php if (!extension_loaded('gd')) die('skip gd extension not available!'); +if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.1', '<')) { + die("skip test requires GD 2.2.1 or higher"); +} ?> --FILE-- <?php diff --git a/ext/gd/tests/bug67447.phpt b/ext/gd/tests/bug67447.phpt index 2caa49b..878b322 100644 --- a/ext/gd/tests/bug67447.phpt +++ b/ext/gd/tests/bug67447.phpt @@ -1,5 +1,11 @@ --TEST-- Bug #67447 (imagecrop() adds a black line when cropping) +--SKIPIF-- +<?php + if (!extension_loaded('gd')) { + die("skip gd extension not available\n"); + } +?> --FILE-- <?php // true color diff --git a/ext/gd/tests/bug71912.phpt b/ext/gd/tests/bug71912.phpt index c86188b..9cb7921 100644 --- a/ext/gd/tests/bug71912.phpt +++ b/ext/gd/tests/bug71912.phpt @@ -3,6 +3,9 @@ Bug #71912 (libgd: signedness vulnerability) --SKIPIF-- <?php if(!extension_loaded('gd')){ die('skip gd extension not available'); } + if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.0', '<')) { + die("skip test requires GD 2.2.0 or higher"); + } if(!function_exists('imagecreatefromgd2')) die('skip imagecreatefromgd2() not available'); ?> --FILE-- diff --git a/ext/gd/tests/bug72339.phpt b/ext/gd/tests/bug72339.phpt index 2c30ee8..c886283 100644 --- a/ext/gd/tests/bug72339.phpt +++ b/ext/gd/tests/bug72339.phpt @@ -1,7 +1,12 @@ --TEST-- Bug #72339 Integer Overflow in _gd2GetHeader() resulting in heap overflow --SKIPIF-- -<?php if (!function_exists("imagecreatefromgd2")) print "skip"; ?> +<?php +if (!function_exists("imagecreatefromgd2")) print "skip"; +if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) { + die("skip test requires GD 2.2.2 or higher"); +} +?> --FILE-- <?php $fname = dirname(__FILE__) . DIRECTORY_SEPARATOR . "bug72339.gd"; diff --git a/ext/gd/tests/bug72512.phpt b/ext/gd/tests/bug72512.phpt index 2a2024d..3f9e219 100644 --- a/ext/gd/tests/bug72512.phpt +++ b/ext/gd/tests/bug72512.phpt @@ -3,6 +3,9 @@ Bug #19366 (gdimagefill() function crashes (fixed in bundled libgd)) --SKIPIF-- <?php if (!extension_loaded('gd')) die("skip gd extension not available\n"); + if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) { + die("skip test requires GD 2.2.2 or higher"); + } ?> --FILE-- <?php diff --git a/ext/gd/tests/bug72512_0.phpt b/ext/gd/tests/bug72512_0.phpt index 5f98662..565d60a 100644 --- a/ext/gd/tests/bug72512_0.phpt +++ b/ext/gd/tests/bug72512_0.phpt @@ -3,6 +3,9 @@ Bug #72512 gdImageTrueColorToPaletteBody allows arbitrary write/read access, var --SKIPIF-- <?php if (!extension_loaded('gd')) die("skip gd extension not available\n"); + if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) { + die("skip test requires GD 2.2.2 or higher"); + } ?> --FILE-- <?php diff --git a/ext/gd/tests/bug72512_1.phpt b/ext/gd/tests/bug72512_1.phpt index bba01a7..2983ff2 100644 --- a/ext/gd/tests/bug72512_1.phpt +++ b/ext/gd/tests/bug72512_1.phpt @@ -3,6 +3,9 @@ Bug #72512 gdImageTrueColorToPaletteBody allows arbitrary write/read access, var --SKIPIF-- <?php if (!extension_loaded('gd')) die("skip gd extension not available\n"); + if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) { + die("skip test requires GD 2.2.2 or higher"); + } ?> --FILE-- <?php diff --git a/ext/gd/tests/github_bug_215.phpt b/ext/gd/tests/github_bug_215.phpt index f44a540..8657f95 100644 --- a/ext/gd/tests/github_bug_215.phpt +++ b/ext/gd/tests/github_bug_215.phpt @@ -3,6 +3,9 @@ Github #215 (imagefilltoborder stack overflow when invalid pallete index used) --SKIPIF-- <?php if (!extension_loaded("gd")) die("skip GD not present"); +if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) { + die("skip test requires GD 2.2.2 or higher"); +} ?> --FILE-- <?php diff --git a/ext/gd/tests/imagecolorallocatealpha_basic.phpt b/ext/gd/tests/imagecolorallocatealpha_basic.phpt index a42c51d..8595b40 100644 --- a/ext/gd/tests/imagecolorallocatealpha_basic.phpt +++ b/ext/gd/tests/imagecolorallocatealpha_basic.phpt @@ -5,6 +5,9 @@ Rafael Dohms <rdohms [at] gmail [dot] com> --SKIPIF-- <?php if (!extension_loaded("gd")) die("skip GD not present"); + if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) { + die("skip test requires GD 2.2.2 or higher"); + } ?> --FILE-- <?php diff --git a/ext/gd/tests/imagefilledarc_basic.phpt b/ext/gd/tests/imagefilledarc_basic.phpt index 4e3bf29..8c76a83 100644 --- a/ext/gd/tests/imagefilledarc_basic.phpt +++ b/ext/gd/tests/imagefilledarc_basic.phpt @@ -6,6 +6,9 @@ Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br> --SKIPIF-- <?php if (!extension_loaded("gd")) die("skip GD not present"); +if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) { + die("skip test requires GD 2.2.2 or higher"); +} ?> --FILE-- <?php diff --git a/ext/gd/tests/imagefilledarc_variation1.phpt b/ext/gd/tests/imagefilledarc_variation1.phpt index 257c898..f4130a9 100644 --- a/ext/gd/tests/imagefilledarc_variation1.phpt +++ b/ext/gd/tests/imagefilledarc_variation1.phpt @@ -6,6 +6,9 @@ Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br> --SKIPIF-- <?php if (!extension_loaded("gd")) die("skip GD not present"); +if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) { + die("skip test requires GD 2.2.2 or higher"); +} ?> --FILE-- <?php diff --git a/ext/gd/tests/imagefilledarc_variation2.phpt b/ext/gd/tests/imagefilledarc_variation2.phpt index c6ccca4..033d6f6 100644 --- a/ext/gd/tests/imagefilledarc_variation2.phpt +++ b/ext/gd/tests/imagefilledarc_variation2.phpt @@ -6,6 +6,9 @@ Edgar Ferreira da Silva <contato [at] edgarfs [dot] com [dot] br> --SKIPIF-- <?php if (!extension_loaded("gd")) die("skip GD not present"); +if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) { + die("skip test requires GD 2.2.2 or higher"); +} ?> --FILE-- <?php diff --git a/ext/gd/tests/imagegammacorrect_basic.phpt b/ext/gd/tests/imagegammacorrect_basic.phpt index 0f4a9fd..b803e95 100644 --- a/ext/gd/tests/imagegammacorrect_basic.phpt +++ b/ext/gd/tests/imagegammacorrect_basic.phpt @@ -6,6 +6,9 @@ Rafael Dohms <rdohms [at] gmail [dot] com> --SKIPIF-- <?php if (!extension_loaded("gd")) die("skip GD not present"); + if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) { + die("skip test requires GD 2.2.2 or higher"); + } ?> --FILE-- <?php diff --git a/ext/gd/tests/imagegammacorrect_variation1.phpt b/ext/gd/tests/imagegammacorrect_variation1.phpt index f022d1d..a0df819 100644 --- a/ext/gd/tests/imagegammacorrect_variation1.phpt +++ b/ext/gd/tests/imagegammacorrect_variation1.phpt @@ -6,6 +6,9 @@ Rafael Dohms <rdohms [at] gmail [dot] com> --SKIPIF-- <?php if (!extension_loaded("gd")) die("skip GD not present"); + if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) { + die("skip test requires GD 2.2.2 or higher"); + } ?> --FILE-- <?php diff --git a/ext/gd/tests/imagetruecolortopalette_basic.phpt b/ext/gd/tests/imagetruecolortopalette_basic.phpt index bbc1277..e7b3274 100644 --- a/ext/gd/tests/imagetruecolortopalette_basic.phpt +++ b/ext/gd/tests/imagetruecolortopalette_basic.phpt @@ -5,6 +5,9 @@ Rafael Dohms <rdohms [at] gmail [dot] com> --SKIPIF-- <?php if (!extension_loaded("gd")) die("skip GD not present"); + if (!GD_BUNDLED && version_compare(GD_VERSION, '2.2.2', '<')) { + die("skip test requires GD 2.2.2 or higher"); + } if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible"); ?> --FILE--