From: Fabien Villepinte <fabien.villepinte@gmail.com>
Date: Wed, 18 Dec 2019 10:08:24 +0000 (+0100)
Subject: Add CONFLICTS tag
X-Git-Tag: php-7.4.7RC1~407
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=203308f6c39730fb356a9e8b1bd4760cf2643cdf;p=php

Add CONFLICTS tag

These tests can be the reason file_get_contents_variation8.phpt fails times to times.
---

diff --git a/ext/standard/tests/file/copy_variation3-win32.phpt b/ext/standard/tests/file/copy_variation3-win32.phpt
index 011e342be4..a8a3aeb746 100644
--- a/ext/standard/tests/file/copy_variation3-win32.phpt
+++ b/ext/standard/tests/file/copy_variation3-win32.phpt
@@ -5,6 +5,8 @@ Test copy() function: usage variations - destination file names(white spaces)
 if(substr(PHP_OS, 0, 3) != "WIN")
   die("skip only run on Windows");
 ?>
+--CONFLICTS--
+obscure_filename
 --FILE--
 <?php
 /* Prototype: bool copy ( string $source, string $dest );
diff --git a/ext/standard/tests/file/copy_variation3.phpt b/ext/standard/tests/file/copy_variation3.phpt
index af2b47749d..ca70ed24f4 100644
--- a/ext/standard/tests/file/copy_variation3.phpt
+++ b/ext/standard/tests/file/copy_variation3.phpt
@@ -5,6 +5,8 @@ Test copy() function: usage variations - destination file names(white spaces)
 if(substr(PHP_OS, 0, 3) == "WIN")
   die("skip do not run on Windows");
 ?>
+--CONFLICTS--
+obscure_filename
 --FILE--
 <?php
 /* Prototype: bool copy ( string $source, string $dest );