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 /ext/standard/tests/file/disk_total_space_variation.phpt | |
| parent | 249e9a63e8da5804031c098e4a7fef7b6ea98fc7 (diff) | |
| parent | 4ac3bda4620eae9253fda171c2c9682714c7ea87 (diff) | |
| download | php-git-b7edbbdbbb11f4ddf1d87468b04b9d0fb0212791.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Prevent parallel test conflicts
Diffstat (limited to 'ext/standard/tests/file/disk_total_space_variation.phpt')
| -rw-r--r-- | ext/standard/tests/file/disk_total_space_variation.phpt | 2 |
1 files changed, 2 insertions, 0 deletions
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 /* |