diff options
author | Stanislav Malyshev <stas@php.net> | 2015-01-04 19:45:57 -0800 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2015-01-04 19:45:57 -0800 |
commit | 75f93ed663ce9b7e1f8742b6840505884a143682 (patch) | |
tree | 612fdbc8ffc289b6ffcd9b97bf9a14ac8c6898a1 /ext/gd | |
parent | 4ed261870f5106b904577e394efa70fc5b689a1c (diff) | |
download | php-git-75f93ed663ce9b7e1f8742b6840505884a143682.tar.gz |
fix GD tests with no GD loaded
Diffstat (limited to 'ext/gd')
-rw-r--r-- | ext/gd/tests/bug67248.phpt | 2 | ||||
-rw-r--r-- | ext/gd/tests/imagegd2_nullbyte_injection.phpt | 4 | ||||
-rw-r--r-- | ext/gd/tests/imagegd_nullbyte_injection.phpt | 4 | ||||
-rw-r--r-- | ext/gd/tests/imagegif_nullbyte_injection.phpt | 1 | ||||
-rw-r--r-- | ext/gd/tests/imagejpeg_nullbyte_injection.phpt | 1 | ||||
-rw-r--r-- | ext/gd/tests/imagepng_nullbyte_injection.phpt | 1 | ||||
-rw-r--r-- | ext/gd/tests/imagewbmp_nullbyte_injection.phpt | 1 | ||||
-rw-r--r-- | ext/gd/tests/imagewebp_nullbyte_injection.phpt | 1 |
8 files changed, 14 insertions, 1 deletions
diff --git a/ext/gd/tests/bug67248.phpt b/ext/gd/tests/bug67248.phpt index 9c83966a60..5cae5f8c98 100644 --- 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 49affefb96..278a4a8023 100644 --- 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 a423a551fd..1ef9354919 100644 --- 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 c3d0c30175..44b1be144f 100644 --- 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 9c52355011..4a45fa3c47 100644 --- 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 13949dca0d..9a5b7c39ea 100644 --- 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 f199626389..54a5749605 100644 --- 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 3bd632591b..166beb181f 100644 --- 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'; |