Skip tests that are supposed to fail due to bugs in old external libgd

diff --git a/ext/gd/tests/bug43121.phpt b/ext/gd/tests/bug43121.phpt
index ce2d1d6f6fcf77794dc7b7bdee53dd9eed745f63..feb10267c2322c45db6a78fd91ac008c0d18449c 100644 (file)
--- 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 b29b9800a58fef54d89aebd5c42d7f291ab25c31..f0302d45efc6ee3b3b17134052bba338ca0d62af 100644 (file)
--- 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 c43a5c6c006cc1c2d3b6c1f8be469914909cec8b..43d11ae35693f25847f9d1eefd1119f06e2c504f 100644 (file)
--- 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 6cbae2016ce88a9a29b6c70f38102fbc5f85039f..0c5ee9cc99e95ca62d46d897d6af36ee67711284 100644 (file)
--- 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 ee875de19a3fd39b8ec7fcbcab0b9e13549aac0c..7e8217c27fc69223423b2ef73b8a0953c86f1bbf 100644 (file)
--- 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 d8dae9a4d36dc332d26da23b08458c60d8414625..713daaf85e3615774f54eea34bb97e6822b6f703 100644 (file)
--- 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 79c49a527b45751e6179604bd75c1a23cccbb81b..04ab0b688e2939a908f56b6631e2e770fd927ae2 100644 (file)
--- 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 2caa49b6239ea81904d04effdb4ff62e0383c7c2..878b3226891d0d75d85ad7ebc0982389723a775b 100644 (file)
--- 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 c86188b0f265d3077dbad6a8ac79590cd60d74e4..9cb792126d49a3bcfcaea023f6d3ecdfa7ae91a7 100644 (file)
--- 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 2c30ee8a74e2ebfc23173791176c41d6b962b44a..c8862833464ad76d972be44bc5e08853072f1cff 100644 (file)
--- 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 2a2024d4cbfdcb7e57e99205d66f0491b7e6abc2..3f9e219fc36adc80b5f22836b33391b288b83ef8 100644 (file)
--- 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 5f98662d456989339a73a088426a7390ca50aaff..565d60a6329f551ca8f35892afcab01a97b02ec8 100644 (file)
--- 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 bba01a711863ba5ef85d3bd02051c182c3595fe5..2983ff29b89deb97f957257a6d7f033ad5ee0ac8 100644 (file)
--- 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 f44a5401e182c86639ae5fa5e7568b2770e27dc8..8657f95d768665d0652e726285232075a8282a4e 100644 (file)
--- 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 a42c51d48351d3ff65bb8a2737bb70d38266d76d..8595b405074e775c853f04f2ab8a1aa1939d7d36 100644 (file)
--- 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 4e3bf291370e6c8581ab5d3c235ed2c515b144a5..8c76a83406b78ba04acf0e5a02f6f71d22de204e 100644 (file)
--- 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 257c898abd3a05f04e5ac2447e07c65484aefe37..f4130a9c690a801040a4a96509a4133a0fa4caf1 100644 (file)
--- 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 c6ccca4b172ff7b99148d5832e60518fc55ddfca..033d6f65f05eeef242f695b030377e7b02d26712 100644 (file)
--- 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 0f4a9fdc673149322a47bb115201372a6151aea4..b803e9517f5225ce0d7c0ea27eba030a9d420a4a 100644 (file)
--- 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 f022d1d55929eb1f340b32609b37dce6d807b203..a0df819a7d970b97b04d9d6dfe645307a4d7d22f 100644 (file)
--- 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 bbc12771120081fbdaf76777cb38409700abd029..e7b327475bd09953f052462a4aa74632b573bb72 100644 (file)
--- 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--