com php-src: Prevent test conflicts: ext/phar/tests/include_p ath.phpt ext/phar/tests/mounteddir.phpt ext/phar/tests/ phar_extract.phpt

Commit: 15b394cce982f1511eb4549c4df71c4eb7804836 Author: Christoph M. Becker <cmbecker69@gmx.de> Tue, 14 May 2019 10:06:04 +0200 Parents: dcfc2897323dc864a4d75e524f29d146d4c1554a Branches: PHP-7.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=15b394cce982f1511eb4549c4df71c4eb7804836 Log: Prevent test conflicts Changed paths: M ext/phar/tests/include_path.phpt M ext/phar/tests/mounteddir.phpt M ext/phar/tests/phar_extract.phpt Diff: diff --git a/ext/phar/tests/include_path.phpt b/ext/phar/tests/include_path.phpt index 1ee1ec7..7831fc7 100644 --- a/ext/phar/tests/include_path.phpt +++ b/ext/phar/tests/include_path.phpt @@ -2,6 +2,8 @@ Phar: include_path with phar:// wrapper --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> +--CONFLICTS-- +tempmanifest1.phar.php --INI-- phar.readonly=0 --FILE-- diff --git a/ext/phar/tests/mounteddir.phpt b/ext/phar/tests/mounteddir.phpt index 80c8f7d..0a89e58 100644 --- a/ext/phar/tests/mounteddir.phpt +++ b/ext/phar/tests/mounteddir.phpt @@ -4,6 +4,8 @@ Phar: mounted manifest directory test <?php if (!extension_loaded("phar")) die("skip"); ?> +--CONFLICTS-- +tempmanifest1.phar.php --INI-- phar.readonly=0 --FILE-- diff --git a/ext/phar/tests/phar_extract.phpt b/ext/phar/tests/phar_extract.phpt index 67648c2..b8cdef7 100644 --- a/ext/phar/tests/phar_extract.phpt +++ b/ext/phar/tests/phar_extract.phpt @@ -2,6 +2,8 @@ Phar: Phar::extractTo() --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> +--CONFLICTS-- +tempmanifest1.phar.php --INI-- phar.readonly=0 --FILE--