From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Tue, 14 May 2019 08:06:04 +0000 (+0200)
Subject: Prevent test conflicts
X-Git-Tag: php-7.4.0alpha1~268
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=15b394cce982f1511eb4549c4df71c4eb7804836;p=php

Prevent test conflicts
---

diff --git a/ext/phar/tests/include_path.phpt b/ext/phar/tests/include_path.phpt
index 1ee1ec77d5..7831fc72e3 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 80c8f7d0ee..0a89e586ed 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 67648c2935..b8cdef7c79 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--