com php-src: Make parallel run-tests compatible with IO capture tests: run-tests.php
| From: | Nikita Popov | Date: | Tue, 19 Feb 2019 14:53:15 +0000 |
| Subject: | com php-src: Make parallel run-tests compatible with IO capture tests: run-tests.php | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-104738@lists.php.net to get a copy of this message | ||
Commit: fa915614fe93a37415b4cd07515d97e39799c696
Author: Nikita Popov <nikita.ppv@gmail.com> Mon, 18 Feb 2019 15:36:39 +0100
Parents: 5cde3afda76814bfed00790ac1100b9a1384b978
Branches: PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fa915614fe93a37415b4cd07515d97e39799c696
Log:
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.
Changed paths:
M run-tests.php
Diff:
diff --git a/run-tests.php b/run-tests.php
index 198b8f4..42aa51c 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -391,7 +391,6 @@ NO_PROC_OPEN_ERROR;
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 @@ NAME_AND_SHAME;
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 + [