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 a048af6ccbf611f047155ce3477a95a447ebd4c0..0ed1dcea9584cb9dc91d893d2ff0fbde17a7aff3 100644 (file)
--- 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 f6f041118c74aed715938c453f6ac6090504eff3..b32b60f6b6beb6d3e0c2557b7d67e0beac380ced 100644 (file)
--- 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 c3a2854eff5bed4343788d5745064813e7f6a98d..c280f5e064861f9ac1ccf7d8185878c7c698e15d 100644 (file)
--- 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 125d093ccd5a89e5786297d3774e5f4f5a909c2e..8fd5cc3c53eadd080ea877f90f3c3ccb6022da0a 100644 (file)
--- 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 3ba3771aacb7630db6bb02ef22464588364bb85a..05d1f074d30e5f22d438adcd0d54ceef16a8afb9 100644 (file)
--- 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
 /*