]> granicus.if.org Git - php/commitdiff
Prevent test conflicts
authorChristoph M. Becker <cmbecker69@gmx.de>
Tue, 14 May 2019 08:06:04 +0000 (10:06 +0200)
committerChristoph M. Becker <cmbecker69@gmx.de>
Tue, 14 May 2019 08:11:29 +0000 (10:11 +0200)
ext/phar/tests/include_path.phpt
ext/phar/tests/mounteddir.phpt
ext/phar/tests/phar_extract.phpt

index 1ee1ec77d5738df670defdd63bda4d0a0dd7e50f..7831fc72e35daae71c49df797617935e0a57d044 100644 (file)
@@ -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--
index 80c8f7d0eee284b67051b1db687cd1159a01491e..0a89e586edea20d7a9b0393254c59e986067b933 100644 (file)
@@ -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--
index 67648c2935a1775effb8a6573ad38c3f7f4e5dcf..b8cdef7c792efc9dfd09f4d8ffed2d3a1a6c29e9 100644 (file)
@@ -2,6 +2,8 @@
 Phar: Phar::extractTo()
 --SKIPIF--
 <?php if (!extension_loaded("phar")) die("skip"); ?>
+--CONFLICTS--
+tempmanifest1.phar.php
 --INI--
 phar.readonly=0
 --FILE--