diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-11-27 14:05:47 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-11-27 14:05:47 +0100 |
| commit | b7edbbdbbb11f4ddf1d87468b04b9d0fb0212791 (patch) | |
| tree | 0e7ca34cb599863d03378846fc08779c29be20ef | |
| parent | 249e9a63e8da5804031c098e4a7fef7b6ea98fc7 (diff) | |
| parent | 4ac3bda4620eae9253fda171c2c9682714c7ea87 (diff) | |
| download | php-git-b7edbbdbbb11f4ddf1d87468b04b9d0fb0212791.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Prevent parallel test conflicts
5 files changed, 10 insertions, 0 deletions
diff --git a/ext/standard/tests/file/disk.phpt b/ext/standard/tests/file/disk.phpt index fe415535ba..424de1f6ba 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 5896ad213b..2e6192cf82 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 6c2c3bf833..0fba673f28 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 326fd9ea25..e35981f278 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 /* |