From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Wed, 27 Nov 2019 13:02:44 +0000 (+0100)
Subject: Prevent parallel test conflicts
X-Git-Tag: php-7.4.7RC1~484
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4ac3bda4620eae9253fda171c2c9682714c7ea87;p=php

Prevent parallel test conflicts

The better solution would be to actually use different directory names,
but adding respective CONFLICTS sections solves the issue for now.
---

diff --git a/ext/standard/tests/file/disk.phpt b/ext/standard/tests/file/disk.phpt
index a048af6ccb..0ed1dcea95 100644
--- a/ext/standard/tests/file/disk.phpt
+++ b/ext/standard/tests/file/disk.phpt
@@ -8,6 +8,8 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
     die('skip not for Windows');
 }
 ?>
+--CONFLICTS--
+disk_total_space
 --FILE--
 <?php
 
diff --git a/ext/standard/tests/file/disk_total_space_basic.phpt b/ext/standard/tests/file/disk_total_space_basic.phpt
index f6f041118c..b32b60f6b6 100644
--- a/ext/standard/tests/file/disk_total_space_basic.phpt
+++ b/ext/standard/tests/file/disk_total_space_basic.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Test disk_total_space() function : basic functionality
+--CONFLICTS--
+disk_total_space
 --FILE--
 <?php
 /*
diff --git a/ext/standard/tests/file/disk_total_space_error-win32.phpt b/ext/standard/tests/file/disk_total_space_error-win32.phpt
index c3a2854eff..c280f5e064 100644
--- a/ext/standard/tests/file/disk_total_space_error-win32.phpt
+++ b/ext/standard/tests/file/disk_total_space_error-win32.phpt
@@ -5,6 +5,8 @@ Test disk_total_space() function : error conditions
 if(substr(PHP_OS, 0, 3) != 'WIN' )
   die("skip Valid only for Windows");
 ?>
+--CONFLICTS--
+disk_total_space
 --FILE--
 <?php
 /*
diff --git a/ext/standard/tests/file/disk_total_space_error.phpt b/ext/standard/tests/file/disk_total_space_error.phpt
index 125d093ccd..8fd5cc3c53 100644
--- a/ext/standard/tests/file/disk_total_space_error.phpt
+++ b/ext/standard/tests/file/disk_total_space_error.phpt
@@ -5,6 +5,8 @@ Test disk_total_space() function : error conditions
 if(substr(PHP_OS, 0, 3) == 'WIN')
   die("skip Not valid on Windows");
 ?>
+--CONFLICTS--
+disk_total_space
 --FILE--
 <?php
 /*
diff --git a/ext/standard/tests/file/disk_total_space_variation.phpt b/ext/standard/tests/file/disk_total_space_variation.phpt
index 3ba3771aac..05d1f074d3 100644
--- a/ext/standard/tests/file/disk_total_space_variation.phpt
+++ b/ext/standard/tests/file/disk_total_space_variation.phpt
@@ -1,5 +1,7 @@
 --TEST--
 Testing disk_total_space() functions : Usage Variations.
+--CONFLICTS--
+disk_total_space
 --FILE--
 <?php
 /*