- 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 5199fd2c460ea5eed3fa3f94974825131967eae8..b81bdbde5f9f114cc141503fc9d726db55268c67 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
@@ -61,4 +60,4 @@ string(18) "image/vnd.wap.wbmp"
 string(24) "application/octet-stream"
 string(9) "image/xbm"
 
-Done image_type_to_mime_type() test
\ No newline at end of file
+Done image_type_to_mime_type() test

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 1d679752086ab9be01e15e0c5ba77998539402f3..be65af66d0dcc23e8ec2b0a8617333ec02d35c04 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 6871a28b7326c40717ad5717375940fb5b668e21..ded52da07b7151a69534e1241c1619e774b9d781 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