fix GD tests with no GD loaded

diff --git a/ext/gd/tests/bug67248.phpt b/ext/gd/tests/bug67248.phpt
index 9c83966a60a5d2522e17ab6f21a3086dbf46ae32..5cae5f8c98a2de4233a4b2bc2e94e20fe30177de 100644 (file)
--- a/ext/gd/tests/bug67248.phpt
+++ b/ext/gd/tests/bug67248.phpt
@@ -2,7 +2,7 @@
 Bug #67248 (imageaffinematrixget missing check of parameters)
 --SKIPIF--
 <?php
-        if(!extension_loaded('gd')){ die('skip gd extension not available')}
+        if(!extension_loaded('gd')){ die('skip gd extension not available'); }
         if(!function_exists('imageaffinematrixget')) die('skip imageaffinematrixget() not available');
 ?>
 --FILE--

diff --git a/ext/gd/tests/imagegd2_nullbyte_injection.phpt b/ext/gd/tests/imagegd2_nullbyte_injection.phpt
index 49affefb96b3238f91ccb24591da7835be081d13..278a4a802395c6e236837dd8d562f9ed2e2958ef 100644 (file)
--- a/ext/gd/tests/imagegd2_nullbyte_injection.phpt
+++ b/ext/gd/tests/imagegd2_nullbyte_injection.phpt
@@ -1,5 +1,9 @@
 --TEST--
 Testing null byte injection in imagegd2
+--SKIPIF--
+<?php
+        if(!extension_loaded('gd')){ die('skip gd extension not available'); }
+?>
 --CLEAN--
 $tempdir = sys_get_temp_dir(). '/php-gdtest';
 foreach (glob($tempdir . "/test*") as $file ) { unlink($file); }

diff --git a/ext/gd/tests/imagegd_nullbyte_injection.phpt b/ext/gd/tests/imagegd_nullbyte_injection.phpt
index a423a551fd4cf2322f678711b42db31dc04b68fc..1ef935491952e7cf802e8d5231c3fcf786e3f80e 100644 (file)
--- a/ext/gd/tests/imagegd_nullbyte_injection.phpt
+++ b/ext/gd/tests/imagegd_nullbyte_injection.phpt
@@ -1,5 +1,9 @@
 --TEST--
 Testing null byte injection in imagegd
+--SKIPIF--
+<?php
+        if(!extension_loaded('gd')){ die('skip gd extension not available'); }
+?>
 --CLEAN--
 $tempdir = sys_get_temp_dir(). '/php-gdtest';
 foreach (glob($tempdir . "/test*") as $file ) { unlink($file); }

diff --git a/ext/gd/tests/imagegif_nullbyte_injection.phpt b/ext/gd/tests/imagegif_nullbyte_injection.phpt
index c3d0c3017595323d8c4a7099e07e9fa234b978d3..44b1be144fa20873cad466ff58dcbcc4e4b933f8 100644 (file)
--- a/ext/gd/tests/imagegif_nullbyte_injection.phpt
+++ b/ext/gd/tests/imagegif_nullbyte_injection.phpt
@@ -6,6 +6,7 @@ foreach (glob($tempdir . "/test*") as $file ) { unlink($file); }
 rmdir($tempdir);
 --SKIPIF--
 <?php
+if(!extension_loaded('gd')){ die('skip gd extension not available'); }
 $support = gd_info();
 if (!isset($support['GIF Create Support']) || $support['GIF Create Support'] === false) {
        print 'skip gif support not available';

diff --git a/ext/gd/tests/imagejpeg_nullbyte_injection.phpt b/ext/gd/tests/imagejpeg_nullbyte_injection.phpt
index 9c52355011b9e3c93f920749b37ee5bd0981ec71..4a45fa3c47b47d81f1c4a12ae1ea5ed9c11b5d0f 100644 (file)
--- a/ext/gd/tests/imagejpeg_nullbyte_injection.phpt
+++ b/ext/gd/tests/imagejpeg_nullbyte_injection.phpt
@@ -6,6 +6,7 @@ foreach (glob($tempdir . "/test*") as $file ) { unlink($file); }
 rmdir($tempdir);
 --SKIPIF--
 <?php
+if(!extension_loaded('gd')){ die('skip gd extension not available'); }
 $support = gd_info();
 if (!isset($support['JPEG Support']) || $support['JPEG Support'] === false) {
        print 'skip jpeg support not available';

diff --git a/ext/gd/tests/imagepng_nullbyte_injection.phpt b/ext/gd/tests/imagepng_nullbyte_injection.phpt
index 13949dca0d7f5d3c413a05ad9144cc0f76b8db35..9a5b7c39ea6bfd158036bb165edd10c6d267b5b4 100644 (file)
--- a/ext/gd/tests/imagepng_nullbyte_injection.phpt
+++ b/ext/gd/tests/imagepng_nullbyte_injection.phpt
@@ -6,6 +6,7 @@ foreach (glob($tempdir . "/test*") as $file ) { unlink($file); }
 rmdir($tempdir);
 --SKIPIF--
 <?php
+if(!extension_loaded('gd')){ die('skip gd extension not available'); }
 $support = gd_info();
 if (!isset($support['PNG Support']) || $support['PNG Support'] === false) {
        print 'skip png support not available';

diff --git a/ext/gd/tests/imagewbmp_nullbyte_injection.phpt b/ext/gd/tests/imagewbmp_nullbyte_injection.phpt
index f199626389d376daae3b9a6a53392c916a0e410a..54a574960587f7e942cb526fa46e0e2b6661a4df 100644 (file)
--- a/ext/gd/tests/imagewbmp_nullbyte_injection.phpt
+++ b/ext/gd/tests/imagewbmp_nullbyte_injection.phpt
@@ -6,6 +6,7 @@ foreach (glob($tempdir . "/test*") as $file ) { unlink($file); }
 rmdir($tempdir);
 --SKIPIF--
 <?php
+if(!extension_loaded('gd')){ die('skip gd extension not available'); }
 $support = gd_info();
 if (!isset($support['WBMP Support']) || $support['WBMP Support'] === false) {
        print 'skip wbmp support not available';

diff --git a/ext/gd/tests/imagewebp_nullbyte_injection.phpt b/ext/gd/tests/imagewebp_nullbyte_injection.phpt
index 3bd632591bb329cf0bca2cba73ab075bd98cf0bb..166beb181fb8ca162f97ec901dec93d046a8265a 100644 (file)
--- a/ext/gd/tests/imagewebp_nullbyte_injection.phpt
+++ b/ext/gd/tests/imagewebp_nullbyte_injection.phpt
@@ -6,6 +6,7 @@ foreach (glob($tempdir . "/test*") as $file ) { unlink($file); }
 rmdir($tempdir);
 --SKIPIF--
 <?php
+if(!extension_loaded('gd')){ die('skip gd extension not available'); }
 $support = gd_info();
 if (!isset($support['WEBP Support']) || $support['WEBP Support'] === false) {
        print 'skip webp support not available';