diff options
| author | Christoph M. Becker <cmb@php.net> | 2015-07-31 13:54:32 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmb@php.net> | 2015-07-31 13:54:32 +0200 |
| commit | 716387288e48f6fab6782e2591025f35e93dd9d9 (patch) | |
| tree | e10fe32a843d9641a5a468df6d8054f08206df62 | |
| parent | b6803c75d90a9e1b1d3e60b2e3b19eb5f6c4d6f2 (diff) | |
| parent | cdabbd9542a41bb2a1ce3b1d85b88003e0a1a19c (diff) | |
| download | php-git-716387288e48f6fab6782e2591025f35e93dd9d9.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
test requires imagejpeg(); skip otherwise
| -rw-r--r-- | ext/standard/tests/image/bug70096.phpt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/standard/tests/image/bug70096.phpt b/ext/standard/tests/image/bug70096.phpt index 1674d07a73..0dd55cb6ca 100644 --- a/ext/standard/tests/image/bug70096.phpt +++ b/ext/standard/tests/image/bug70096.phpt @@ -3,6 +3,7 @@ Bug #70096 (Repeated iptcembed() adds superfluous FF bytes) --SKIPIF-- <?php if (!extension_loaded('gd')) die('skip gd extension not available'); +if (!function_exists('imagejpeg')) die('skip imagejpeg not available'); ?> --FILE-- <?php |