From: Raphael Geissert <geissert@php.net>
Date: Thu, 11 Mar 2010 05:49:50 +0000 (+0000)
Subject: Properly skip tests that require the bundled gd lib when the external is used
X-Git-Tag: php-5.4.0alpha1~205
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2c3b1fd9207d7408814018de8abe2a692fac26a0;p=php

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 cede1ac17f..bc0790ede4 100644
--- 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')) {
 	die('skip gd extension not available');
 }
+if (!GD_BUNDLED) die("skip requires bundled GD library\n");
 ?>
 --FILE--
 <?php
diff --git a/ext/gd/tests/imageantialias_error1.phpt b/ext/gd/tests/imageantialias_error1.phpt
index 53fe0cc66a..e9475e9571 100755
--- 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 8dad8bd115..64b0a60eba 100755
--- 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 6dbc8600c6..a34e05e02f 100644
--- 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 ad457103cf..21f37a8a1e 100644
--- 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 7fb993969d..d8d331bfdc 100644
--- 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 9f99186333..d4deff1076 100644
--- 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