From fa915614fe93a37415b4cd07515d97e39799c696 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 18 Feb 2019 15:36:39 +0100 Subject: [PATCH] Make parallel run-tests compatible with IO capture tests Inherit the main stdin/stdout/stderr streams into the worker processes. We don't talk to workers via these pipes, so there shouldn't be a problem doing this. --- run-tests.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/run-tests.php b/run-tests.php index 198b8f4765529..42aa51ce6a93e 100755 --- a/run-tests.php +++ b/run-tests.php @@ -391,7 +391,6 @@ function main() error("'$workers' is not a valid number of workers, try e.g. -j16 for 16 workers"); } $workers = intval($workers, 10); - $environment['SKIP_IO_CAPTURE_TESTS'] = 1; break; case 'r': case 'l': @@ -1434,11 +1433,7 @@ function run_all_tests_parallel($test_files, $env, $redir_tested) { for ($i = 1; $i <= $workers; $i++) { $proc = proc_open( $thisPHP . ' ' . escapeshellarg($thisScript), - [ - 0 => ['pipe', 'r'], - 1 => ['pipe', 'w'], - 2 => ['pipe', 'w'] - ], + [], // Inherit our stdin, stdout and stderr $pipes, NULL, $_ENV + [