From 4ac3bda4620eae9253fda171c2c9682714c7ea87 Mon Sep 17 00:00:00 2001
From: "Christoph M. Becker" <cmbecker69@gmx.de>
Date: Wed, 27 Nov 2019 14:02:44 +0100
Subject: [PATCH] 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.
---
 ext/standard/tests/file/disk.phpt                         | 2 ++
 ext/standard/tests/file/disk_total_space_basic.phpt       | 2 ++
 ext/standard/tests/file/disk_total_space_error-win32.phpt | 2 ++
 ext/standard/tests/file/disk_total_space_error.phpt       | 2 ++
 ext/standard/tests/file/disk_total_space_variation.phpt   | 2 ++
 5 files changed, 10 insertions(+)

diff --git a/ext/standard/tests/file/disk.phpt b/ext/standard/tests/file/disk.phpt
index a048af6ccbf..0ed1dcea958 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 f6f041118c7..b32b60f6b6b 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 c3a2854eff5..c280f5e0648 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 125d093ccd5..8fd5cc3c53e 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 3ba3771aacb..05d1f074d30 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
 /*