- Fixed tests

diff --git a/ext/gd/tests/image_type_to_mime_type_basic.phpt b/ext/gd/tests/image_type_to_mime_type_basic.phpt
index c06c924e108f4d5a6ce3f5c82fe6fe6eb68bda67..96c1eebc9dd768136dfcd05d196ef8fd7e465bb8 100644 (file)
--- a/ext/gd/tests/image_type_to_mime_type_basic.phpt
+++ b/ext/gd/tests/image_type_to_mime_type_basic.phpt
@@ -2,8 +2,7 @@
 image_type_to_mime_type()
 --SKIPIF--
 <?php 
-       if (!function_exists('image_type_to_mime_type')) die('skip image_type_to_mime_type() not available'); 
-       require_once('skipif_imagetype.inc');
+       if (!function_exists('image_type_to_mime_type')) die('skip image_type_to_mime_type() not available');
 ?>
 --FILE--
 <?php

diff --git a/ext/gd/tests/imagecopyresampled_basic.phpt b/ext/gd/tests/imagecopyresampled_basic.phpt
index 12ac155119b8e4eb6695da32269f132bf85622a3..a0454faf865e8d5bca84a5d1cd193de08fe83564 100644 (file)
--- a/ext/gd/tests/imagecopyresampled_basic.phpt
+++ b/ext/gd/tests/imagecopyresampled_basic.phpt
@@ -3,7 +3,7 @@ imagecopyresampled()
 --SKIPIF--
 <?php 
        if (!function_exists('imagecopyresampled')) die('skip imagecopyresampled() not available'); 
-       require_once('skipif_imagetype.inc');
+       if (!(imagetype() & IMG_PNG)) die('skip PNG Support is not enabled');
 ?>
 --FILE--
 <?php

diff --git a/ext/gd/tests/imagedashedline_basic.phpt b/ext/gd/tests/imagedashedline_basic.phpt
index 09da72d550c6069a92f7bd4304a524f4dd4d4e9e..7815bc545613402aa188fc7a26b4b5bcb63e7aa5 100644 (file)
--- a/ext/gd/tests/imagedashedline_basic.phpt
+++ b/ext/gd/tests/imagedashedline_basic.phpt
@@ -3,7 +3,7 @@ imagedashedline()
 --SKIPIF--
 <?php 
        if (!function_exists('imagedashedline')) die('skip imagedashedline() not available'); 
-       require_once('skipif_imagetype.inc');
+       if (!(imagetype() & IMG_PNG)) die('skip PNG Support is not enabled');
 ?>
 --FILE--
 <?php

diff --git a/ext/gd/tests/imagefilledpolygon_basic.phpt b/ext/gd/tests/imagefilledpolygon_basic.phpt
index 7493582b2faf324104cebd433b0aac2e167589f2..300397bf62b02aab8e9bd1bf53d5ca1812202f5d 100644 (file)
--- a/ext/gd/tests/imagefilledpolygon_basic.phpt
+++ b/ext/gd/tests/imagefilledpolygon_basic.phpt
@@ -3,7 +3,7 @@ imagefilledpolygon()
 --SKIPIF--
 <?php 
        if (!function_exists('imagefilledpolygon')) die('skip imagefilledpolygon() not available'); 
-       require_once('skipif_imagetype.inc');
+       if (!(imagetype() & IMG_PNG)) die('skip PNG Support is not enabled');
 ?>
 --FILE--
 <?php