php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-12 18:43:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.4'

Browse Source 
* PHP-7.4:
  Prevent parallel test conflicts
This commit is contained in:
Christoph M. Becker
2019-11-27 14:05:47 +01:00
parent 249e9a63e8 4ac3bda462
commit b7edbbdbbb
5 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ext/standard/tests/file/disk.phpt
View File

@@ -8,6 +8,8 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
die('skip not for Windows');
}
?>
--CONFLICTS--
disk_total_space
--FILE--
<?php

2
ext/standard/tests/file/disk_total_space_basic.phpt
View File

@@ -1,5 +1,7 @@
--TEST--
Test disk_total_space() function : basic functionality
--CONFLICTS--
disk_total_space
--FILE--
<?php
/*

2
ext/standard/tests/file/disk_total_space_error-win32.phpt
View File

@@ -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
/*

2
ext/standard/tests/file/disk_total_space_error.phpt
View File

@@ -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
/*

2
ext/standard/tests/file/disk_total_space_variation.phpt
View File

@@ -1,5 +1,7 @@
--TEST--
Testing disk_total_space() functions : Usage Variations.
--CONFLICTS--
disk_total_space
--FILE--
<?php
/*