geissert Thu, 11 Mar 2010 05:49:50 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=296058
Log:
Properly skip tests that require the bundled gd lib when the external is used
Changed paths:
U php/php-src/branches/PHP_5_2/ext/gd/tests/bug42434.phpt
U php/php-src/branches/PHP_5_2/ext/gd/tests/imageantialias_error1.phpt
U php/php-src/branches/PHP_5_2/ext/gd/tests/imageantialias_error2.phpt
U php/php-src/branches/PHP_5_2/ext/gd/tests/imagelayereffect_basic.phpt
U php/php-src/branches/PHP_5_2/ext/gd/tests/imagelayereffect_error1.phpt
U php/php-src/branches/PHP_5_2/ext/gd/tests/imagelayereffect_error3.phpt
U php/php-src/branches/PHP_5_3/ext/gd/tests/bug42434.phpt
U php/php-src/branches/PHP_5_3/ext/gd/tests/imageantialias_error1.phpt
U php/php-src/branches/PHP_5_3/ext/gd/tests/imageantialias_error2.phpt
U php/php-src/branches/PHP_5_3/ext/gd/tests/imagelayereffect_basic.phpt
U php/php-src/branches/PHP_5_3/ext/gd/tests/imagelayereffect_error1.phpt
U php/php-src/branches/PHP_5_3/ext/gd/tests/imagelayereffect_error2.phpt
U php/php-src/branches/PHP_5_3/ext/gd/tests/imagelayereffect_error3.phpt
U php/php-src/trunk/ext/gd/tests/bug42434.phpt
U php/php-src/trunk/ext/gd/tests/imageantialias_error1.phpt
U php/php-src/trunk/ext/gd/tests/imageantialias_error2.phpt
U php/php-src/trunk/ext/gd/tests/imagelayereffect_basic.phpt
U php/php-src/trunk/ext/gd/tests/imagelayereffect_error1.phpt
U php/php-src/trunk/ext/gd/tests/imagelayereffect_error2.phpt
U php/php-src/trunk/ext/gd/tests/imagelayereffect_error3.phpt
Modified: php/php-src/branches/PHP_5_2/ext/gd/tests/bug42434.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/gd/tests/bug42434.phpt 2010-03-11 05:48:42 UTC (rev 296057)
+++ php/php-src/branches/PHP_5_2/ext/gd/tests/bug42434.phpt 2010-03-11 05:49:50 UTC (rev 296058)
@@ -5,6 +5,7 @@
if (!extension_loaded('gd')) {
die('skip gd extension not available');
}
+if (!GD_BUNDLED) die("skip requires bundled GD library\n");
?>
--FILE--
<?php
Modified: php/php-src/branches/PHP_5_2/ext/gd/tests/imageantialias_error1.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/gd/tests/imageantialias_error1.phpt 2010-03-11 05:48:42 UTC (rev 296057)
+++ php/php-src/branches/PHP_5_2/ext/gd/tests/imageantialias_error1.phpt 2010-03-11 05:49:50 UTC (rev 296058)
@@ -6,6 +6,7 @@
--SKIPIF--
<?php
if (!extension_loaded("gd")) die("skip GD not present");
+if (!GD_BUNDLED) die("skip requires bundled GD library\n");
?>
--FILE--
<?php
Modified: php/php-src/branches/PHP_5_2/ext/gd/tests/imageantialias_error2.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/gd/tests/imageantialias_error2.phpt 2010-03-11 05:48:42 UTC (rev 296057)
+++ php/php-src/branches/PHP_5_2/ext/gd/tests/imageantialias_error2.phpt 2010-03-11 05:49:50 UTC (rev 296058)
@@ -6,6 +6,7 @@
--SKIPIF--
<?php
if (!extension_loaded("gd")) die("skip GD not present");
+if (!GD_BUNDLED) die("skip requires bundled GD library\n");
?>
--FILE--
<?php
Modified: php/php-src/branches/PHP_5_2/ext/gd/tests/imagelayereffect_basic.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/gd/tests/imagelayereffect_basic.phpt 2010-03-11 05:48:42 UTC (rev 296057)
+++ php/php-src/branches/PHP_5_2/ext/gd/tests/imagelayereffect_basic.phpt 2010-03-11 05:49:50 UTC (rev 296058)
@@ -6,7 +6,7 @@
--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
Modified: php/php-src/branches/PHP_5_2/ext/gd/tests/imagelayereffect_error1.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/gd/tests/imagelayereffect_error1.phpt 2010-03-11 05:48:42 UTC (rev 296057)
+++ php/php-src/branches/PHP_5_2/ext/gd/tests/imagelayereffect_error1.phpt 2010-03-11 05:49:50 UTC (rev 296058)
@@ -6,7 +6,7 @@
--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
Modified: php/php-src/branches/PHP_5_2/ext/gd/tests/imagelayereffect_error3.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/gd/tests/imagelayereffect_error3.phpt 2010-03-11 05:48:42 UTC (rev 296057)
+++ php/php-src/branches/PHP_5_2/ext/gd/tests/imagelayereffect_error3.phpt 2010-03-11 05:49:50 UTC (rev 296058)
@@ -6,7 +6,7 @@
--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
Modified: php/php-src/branches/PHP_5_3/ext/gd/tests/bug42434.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/gd/tests/bug42434.phpt 2010-03-11 05:48:42 UTC (rev 296057)
+++ php/php-src/branches/PHP_5_3/ext/gd/tests/bug42434.phpt 2010-03-11 05:49:50 UTC (rev 296058)
@@ -5,6 +5,7 @@
if (!extension_loaded('gd')) {
die('skip gd extension not available');
}
+if (!GD_BUNDLED) die("skip requires bundled GD library\n");
?>
--FILE--
<?php
Modified: php/php-src/branches/PHP_5_3/ext/gd/tests/imageantialias_error1.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/gd/tests/imageantialias_error1.phpt 2010-03-11 05:48:42 UTC (rev 296057)
+++ php/php-src/branches/PHP_5_3/ext/gd/tests/imageantialias_error1.phpt 2010-03-11 05:49:50 UTC (rev 296058)
@@ -6,6 +6,7 @@
--SKIPIF--
<?php
if (!extension_loaded("gd")) die("skip GD not present");
+if (!GD_BUNDLED) die("skip requires bundled GD library\n");
?>
--FILE--
<?php
Modified: php/php-src/branches/PHP_5_3/ext/gd/tests/imageantialias_error2.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/gd/tests/imageantialias_error2.phpt 2010-03-11 05:48:42 UTC (rev 296057)
+++ php/php-src/branches/PHP_5_3/ext/gd/tests/imageantialias_error2.phpt 2010-03-11 05:49:50 UTC (rev 296058)
@@ -6,6 +6,7 @@
--SKIPIF--
<?php
if (!extension_loaded("gd")) die("skip GD not present");
+if (!GD_BUNDLED) die("skip requires bundled GD library\n");
?>
--FILE--
<?php
Modified: php/php-src/branches/PHP_5_3/ext/gd/tests/imagelayereffect_basic.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/gd/tests/imagelayereffect_basic.phpt 2010-03-11 05:48:42 UTC (rev 296057)
+++ php/php-src/branches/PHP_5_3/ext/gd/tests/imagelayereffect_basic.phpt 2010-03-11 05:49:50 UTC (rev 296058)
@@ -6,7 +6,7 @@
--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
Modified: php/php-src/branches/PHP_5_3/ext/gd/tests/imagelayereffect_error1.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/gd/tests/imagelayereffect_error1.phpt 2010-03-11 05:48:42 UTC (rev 296057)
+++ php/php-src/branches/PHP_5_3/ext/gd/tests/imagelayereffect_error1.phpt 2010-03-11 05:49:50 UTC (rev 296058)
@@ -6,7 +6,7 @@
--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
Modified: php/php-src/branches/PHP_5_3/ext/gd/tests/imagelayereffect_error2.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/gd/tests/imagelayereffect_error2.phpt 2010-03-11 05:48:42 UTC (rev 296057)
+++ php/php-src/branches/PHP_5_3/ext/gd/tests/imagelayereffect_error2.phpt 2010-03-11 05:49:50 UTC (rev 296058)
@@ -6,7 +6,7 @@
--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
Modified: php/php-src/branches/PHP_5_3/ext/gd/tests/imagelayereffect_error3.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/gd/tests/imagelayereffect_error3.phpt 2010-03-11 05:48:42 UTC (rev 296057)
+++ php/php-src/branches/PHP_5_3/ext/gd/tests/imagelayereffect_error3.phpt 2010-03-11 05:49:50 UTC (rev 296058)
@@ -6,7 +6,7 @@
--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
Modified: php/php-src/trunk/ext/gd/tests/bug42434.phpt
===================================================================
--- php/php-src/trunk/ext/gd/tests/bug42434.phpt 2010-03-11 05:48:42 UTC (rev 296057)
+++ php/php-src/trunk/ext/gd/tests/bug42434.phpt 2010-03-11 05:49:50 UTC (rev 296058)
@@ -5,6 +5,7 @@
if (!extension_loaded('gd')) {
die('skip gd extension not available');
}
+if (!GD_BUNDLED) die("skip requires bundled GD library\n");
?>
--FILE--
<?php
Modified: php/php-src/trunk/ext/gd/tests/imageantialias_error1.phpt
===================================================================
--- php/php-src/trunk/ext/gd/tests/imageantialias_error1.phpt 2010-03-11 05:48:42 UTC (rev 296057)
+++ php/php-src/trunk/ext/gd/tests/imageantialias_error1.phpt 2010-03-11 05:49:50 UTC (rev 296058)
@@ -6,6 +6,7 @@
--SKIPIF--
<?php
if (!extension_loaded("gd")) die("skip GD not present");
+if (!GD_BUNDLED) die("skip requires bundled GD library\n");
?>
--FILE--
<?php
Modified: php/php-src/trunk/ext/gd/tests/imageantialias_error2.phpt
===================================================================
--- php/php-src/trunk/ext/gd/tests/imageantialias_error2.phpt 2010-03-11 05:48:42 UTC (rev 296057)
+++ php/php-src/trunk/ext/gd/tests/imageantialias_error2.phpt 2010-03-11 05:49:50 UTC (rev 296058)
@@ -6,6 +6,7 @@
--SKIPIF--
<?php
if (!extension_loaded("gd")) die("skip GD not present");
+if (!GD_BUNDLED) die("skip requires bundled GD library\n");
?>
--FILE--
<?php
Modified: php/php-src/trunk/ext/gd/tests/imagelayereffect_basic.phpt
===================================================================
--- php/php-src/trunk/ext/gd/tests/imagelayereffect_basic.phpt 2010-03-11 05:48:42 UTC (rev 296057)
+++ php/php-src/trunk/ext/gd/tests/imagelayereffect_basic.phpt 2010-03-11 05:49:50 UTC (rev 296058)
@@ -6,7 +6,7 @@
--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
Modified: php/php-src/trunk/ext/gd/tests/imagelayereffect_error1.phpt
===================================================================
--- php/php-src/trunk/ext/gd/tests/imagelayereffect_error1.phpt 2010-03-11 05:48:42 UTC (rev 296057)
+++ php/php-src/trunk/ext/gd/tests/imagelayereffect_error1.phpt 2010-03-11 05:49:50 UTC (rev 296058)
@@ -6,7 +6,7 @@
--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
Modified: php/php-src/trunk/ext/gd/tests/imagelayereffect_error2.phpt
===================================================================
--- php/php-src/trunk/ext/gd/tests/imagelayereffect_error2.phpt 2010-03-11 05:48:42 UTC (rev 296057)
+++ php/php-src/trunk/ext/gd/tests/imagelayereffect_error2.phpt 2010-03-11 05:49:50 UTC (rev 296058)
@@ -6,7 +6,7 @@
--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
Modified: php/php-src/trunk/ext/gd/tests/imagelayereffect_error3.phpt
===================================================================
--- php/php-src/trunk/ext/gd/tests/imagelayereffect_error3.phpt 2010-03-11 05:48:42 UTC (rev 296057)
+++ php/php-src/trunk/ext/gd/tests/imagelayereffect_error3.phpt 2010-03-11 05:49:50 UTC (rev 296058)
@@ -6,7 +6,7 @@
--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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
