From: Felipe Pena <felipe@php.net>
Date: Sat, 26 Sep 2009 16:55:11 +0000 (+0000)
Subject: - Fixed tests
X-Git-Tag: php-5.2.12RC1~103
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6a1736de174059b1fb94c83e466dc22963b348fc;p=php

- 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 7384c46328..2b1de032d8 100644
--- 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 12ac155119..a0454faf86 100644
--- 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 1d67975208..be65af66d0 100644
--- 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 6871a28b73..ded52da07b 100644
--- 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