mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-23 09:54:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add special "all" conflict

Browse Source 
If a test conflicts with "all", then no other tests may be run in
parallel. This is needed for windows_mb_path tests, which rely on
the console codepage, which is shared across all parallel workers.

Also add support for comments in the CONFLICTS section/file.
This commit is contained in:
Nikita Popov 2019-02-21 09:35:30 +01:00
parent 6b110b151d
commit 152e5393e5
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ext/standard/tests/file/windows_mb_path/CONFLICTS
View File

@ -1 +1,3 @@
windows_mb_path
# These tests depend on the console codepage, which is shared across all parallel workers.
# Force these tests to run sequentially to make sure the codepage isn't change by another process.
all

27
run-tests.php
View File

@ -1356,10 +1356,11 @@ function run_all_tests_parallel($test_files, $env, $redir_tested) {
// specified either in the --CONFLICTS-- section, or CONFLICTS file inside a directory.
$dirConflictsWith = [];
$fileConflictsWith = [];
foreach ($test_files as $file) {
$sequentialTests = [];
foreach ($test_files as $i => $file) {
$contents = file_get_contents($file);
if (preg_match('/^--CONFLICTS--(.+?)^--/ms', $contents, $matches)) {
$conflicts = array_map('trim', explode("\n", trim($matches[1])));
$conflicts = parse_conflicts($matches[1]);
} else {
// Cache per-directory conflicts in a separate map, so we compute these only once.
$dir = dirname($file);
@ -1367,13 +1368,20 @@ function run_all_tests_parallel($test_files, $env, $redir_tested) {
$dirConflicts = [];
if (file_exists($dir . '/CONFLICTS')) {
$contents = file_get_contents($dir . '/CONFLICTS');
$dirConflicts = array_map('trim', explode("\n", trim($contents)));
$dirConflicts = parse_conflicts($contents);
}
$dirConflictsWith[$dir] = $dirConflicts;
}
$conflicts = $dirConflictsWith[$dir];
}
// For tests conflicting with "all", no other tests may run in parallel. We'll run these
// tests separately at the end, when only one worker is left.
if (in_array('all', $conflicts, true)) {
$sequentialTests[] = $file;
unset($test_files[$i]);
}
$fileConflictsWith[$file] = $conflicts;
}
@ -1480,7 +1488,7 @@ function run_all_tests_parallel($test_files, $env, $redir_tested) {
$waitingTests = [];
escape:
while ($test_files || $testsInProgress > 0) {
while ($test_files || $sequentialTests || $testsInProgress > 0) {
$toRead = array_values($workerSocks);
$toWrite = NULL;
$toExcept = NULL;
@ -1525,6 +1533,11 @@ escape:
}
// intentional fall-through
case "ready":
// Schedule sequential tests only once we are down to one worker.
if (count($workerProcs) === 1 && $sequentialTests) {
$test_files = array_merge($test_files, $sequentialTests);
$sequentialTests = [];
}
// Batch multiple tests to reduce communication overhead.
$files = [];
$batchSize = $shuffle ? 4 : 32;
@ -3190,6 +3203,12 @@ function clear_show_test() {
}
}
function parse_conflicts(string $text) : array {
// Strip comments
$text = preg_replace('/#.*/', '', $text);
return array_map('trim', explode("\n", trim($text)));
}
function show_result($result, $tested, $tested_file, $extra = '', $temp_filenames = null)
{
global $html_output, $html_file, $temp_target, $temp_urlbase, $line_length, $SHOW_ONLY_GROUPS;