diff options
author | Matteo Beccati <mbeccati@php.net> | 2015-08-29 10:48:53 +0200 |
---|---|---|
committer | Matteo Beccati <mbeccati@php.net> | 2015-08-29 10:48:53 +0200 |
commit | cb5582d3c178119bcd5f8a1d0e2a5f2f90970908 (patch) | |
tree | 5d0aa05b0e5506987e8b8382eec1a3bdd2c2e693 | |
parent | 6b3e44369dd205152c0486ba30cd3a24b6a6c8e0 (diff) | |
parent | 9d816f1bcf973e5e68f080f185616facb53ac23f (diff) | |
download | php-git-cb5582d3c178119bcd5f8a1d0e2a5f2f90970908.tar.gz |
Merge branch 'PHP-5.6'
* PHP-5.6:
Added missing skipif for phar+zlib test
-rw-r--r-- | ext/phar/tests/bug70019.phpt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/phar/tests/bug70019.phpt b/ext/phar/tests/bug70019.phpt index d7976a180d..85bf1780aa 100644 --- a/ext/phar/tests/bug70019.phpt +++ b/ext/phar/tests/bug70019.phpt @@ -1,5 +1,7 @@ --TEST-- Bug #70019 Files extracted from archive may be placed outside of destination directory +--SKIPIF-- +<?php if (!extension_loaded("phar") || !extension_loaded('zlib')) die("skip"); ?> --FILE-- <?php $dir = __DIR__."/bug70019"; |