Properly skip tests that require the bundled gd lib when the external is used

diff --git a/ext/gd/tests/bug42434.phpt b/ext/gd/tests/bug42434.phpt
index cede1ac17fe45f39125357616cc18f4d71e43400..bc0790ede4f3f1b38db5a0bee2dcd6d39b217336 100644 (file)
--- a/ext/gd/tests/bug42434.phpt
+++ b/ext/gd/tests/bug42434.phpt
@@ -5,6 +5,7 @@ Bug #42434 (ImageLine w/ antialias = 1px shorter)
 if (!extension_loaded('gd')) {\r
        die('skip gd extension not available');\r
 }\r
+if (!GD_BUNDLED) die("skip requires bundled GD library\n");\r
 ?>\r
 --FILE--\r
 <?php\r

diff --git a/ext/gd/tests/imageantialias_error1.phpt b/ext/gd/tests/imageantialias_error1.phpt
index 53fe0cc66ace7ae4338ee6b1c5b0e812ef70ca54..e9475e9571314a14a30d9b9cff54742e198fe6b1 100755 (executable)
--- a/ext/gd/tests/imageantialias_error1.phpt
+++ b/ext/gd/tests/imageantialias_error1.phpt
@@ -6,6 +6,7 @@ Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
 --SKIPIF--
 <?php 
 if (!extension_loaded("gd")) die("skip GD not present");
+if (!GD_BUNDLED) die("skip requires bundled GD library\n");
 ?>
 --FILE--
 <?php

diff --git a/ext/gd/tests/imageantialias_error2.phpt b/ext/gd/tests/imageantialias_error2.phpt
index 8dad8bd1153fc4d648aaebdbf9132f7134b73be6..64b0a60eba99bd9b52a8adc7655f231eeaf3e28d 100755 (executable)
--- a/ext/gd/tests/imageantialias_error2.phpt
+++ b/ext/gd/tests/imageantialias_error2.phpt
@@ -6,6 +6,7 @@ Guilherme Blanco <guilhermeblanco [at] hotmail [dot] com>
 --SKIPIF--
 <?php 
 if (!extension_loaded("gd")) die("skip GD not present");
+if (!GD_BUNDLED) die("skip requires bundled GD library\n");
 ?>
 --FILE--
 <?php

diff --git a/ext/gd/tests/imagelayereffect_basic.phpt b/ext/gd/tests/imagelayereffect_basic.phpt
index 6dbc8600c671bc26a779dac47353b62a8af6ebbb..a34e05e02f9cd2da69276a9a5593ed268c4607ef 100644 (file)
--- a/ext/gd/tests/imagelayereffect_basic.phpt
+++ b/ext/gd/tests/imagelayereffect_basic.phpt
@@ -6,7 +6,7 @@ Rafael Dohms <rdohms [at] gmail [dot] com>
 --SKIPIF--
 <?php 
        if (!extension_loaded("gd")) die("skip GD not present");
-       if (!GD_BUNDLED) die('function only available in bundled, external GD detected');
+       if (!GD_BUNDLED) die('skip function only available in bundled, external GD detected');
 ?>
 --FILE--
 <?php

diff --git a/ext/gd/tests/imagelayereffect_error1.phpt b/ext/gd/tests/imagelayereffect_error1.phpt
index ad457103cf7ceba63c8d02ec6eb1f654013e4067..21f37a8a1e4d45565473c0a52e5203255ad80ef7 100644 (file)
--- a/ext/gd/tests/imagelayereffect_error1.phpt
+++ b/ext/gd/tests/imagelayereffect_error1.phpt
@@ -6,7 +6,7 @@ Rafael Dohms <rdohms [at] gmail [dot] com>
 --SKIPIF--
 <?php 
        if (!extension_loaded("gd")) die("skip GD not present");
-       if (!GD_BUNDLED) die('function only available in bundled, external GD detected');
+       if (!GD_BUNDLED) die('skip function only available in bundled, external GD detected');
 ?>
 --FILE--
 <?php

diff --git a/ext/gd/tests/imagelayereffect_error2.phpt b/ext/gd/tests/imagelayereffect_error2.phpt
index 7fb993969d6f07e6b6fbf8c5a04d94671c24d08c..d8d331bfdc7242c88c54a7d7b3d371ee0a55c8a3 100644 (file)
--- a/ext/gd/tests/imagelayereffect_error2.phpt
+++ b/ext/gd/tests/imagelayereffect_error2.phpt
@@ -6,7 +6,7 @@ Rafael Dohms <rdohms [at] gmail [dot] com>
 --SKIPIF--
 <?php 
        if (!extension_loaded("gd")) die("skip GD not present");
-       if (!GD_BUNDLED) die('function only available in bundled, external GD detected');
+       if (!GD_BUNDLED) die('skip function only available in bundled, external GD detected');
 ?>
 --FILE--
 <?php

diff --git a/ext/gd/tests/imagelayereffect_error3.phpt b/ext/gd/tests/imagelayereffect_error3.phpt
index 9f99186333ac8a35684097cf3924504ad8cd482a..d4deff1076c38f9400260b22280c7d3ef32e8a16 100644 (file)
--- a/ext/gd/tests/imagelayereffect_error3.phpt
+++ b/ext/gd/tests/imagelayereffect_error3.phpt
@@ -6,7 +6,7 @@ Rafael Dohms <rdohms [at] gmail [dot] com>
 --SKIPIF--
 <?php 
        if (!extension_loaded("gd")) die("skip GD not present");
-       if (!GD_BUNDLED) die('function only available in bundled, external GD detected');
+       if (!GD_BUNDLED) die('skip function only available in bundled, external GD detected');
 ?>
 --FILE--
 <?php