Skip to content

Commit 4ac3bda

Browse files
committed
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.
1 parent 30aa2e8 commit 4ac3bda

File tree

5 files changed

+10
-0
lines changed

5 files changed

+10
-0
lines changed

ext/standard/tests/file/disk.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
88
die('skip not for Windows');
99
}
1010
?>
11+
--CONFLICTS--
12+
disk_total_space
1113
--FILE--
1214
<?php
1315

ext/standard/tests/file/disk_total_space_basic.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
Test disk_total_space() function : basic functionality
3+
--CONFLICTS--
4+
disk_total_space
35
--FILE--
46
<?php
57
/*

ext/standard/tests/file/disk_total_space_error-win32.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ Test disk_total_space() function : error conditions
55
if(substr(PHP_OS, 0, 3) != 'WIN' )
66
die("skip Valid only for Windows");
77
?>
8+
--CONFLICTS--
9+
disk_total_space
810
--FILE--
911
<?php
1012
/*

ext/standard/tests/file/disk_total_space_error.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ Test disk_total_space() function : error conditions
55
if(substr(PHP_OS, 0, 3) == 'WIN')
66
die("skip Not valid on Windows");
77
?>
8+
--CONFLICTS--
9+
disk_total_space
810
--FILE--
911
<?php
1012
/*

ext/standard/tests/file/disk_total_space_variation.phpt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
Testing disk_total_space() functions : Usage Variations.
3+
--CONFLICTS--
4+
disk_total_space
35
--FILE--
46
<?php
57
/*

0 commit comments

Comments
 (0)