com php-src: explicitly ignore php.ini for proc open tests: ext/standard/tests/general_functions/proc_open_pipes1 .phpt ext/standard/tests/general_functions/proc_open_ pipes2.phpt ext/standard/tests/general_functions/proc _open_pipes3.phpt ext/standard/tests/streams/proc_o pen_bug51800_right.phpt ext/standard/tests/st reams/proc_open_bug51800_right2.phpt ext/ standard/tests/streams/proc_open_bug69900.phpt
[email protected] (Anatol Belski)
| Newsgroups | php.cvs |
|---|---|
| Message-ID | <[email protected]> |
Commit: bc2b500d3e35de1a0916a122f9dab306286d1d77 Author: Anatol Belski <[email protected]> Tue, 21 Mar 2017 12:39:40 +0100 Parents: 6d066dc421e839027805da63aa66d2db892fe386 Branches: PHP-7.0 PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=bc2b500d3e35de1a0916a122f9dab306286d1d77 Log: explicitly ignore php.ini for proc open tests In some cases, when an environment is unclean, tests might get stuck fe when some incorrect ini file is loaded. As the test depends on the core only, it is safer to explicitly ignore the ini. Any ini can be passed in the cmd itself, if needed. Changed paths: M ext/standard/tests/general_functions/proc_open_pipes1.phpt M ext/standard/tests/general_functions/proc_open_pipes2.phpt M ext/standard/tests/general_functions/proc_open_pipes3.phpt M ext/standard/tests/streams/proc_open_bug51800_right.phpt M ext/standard/tests/streams/proc_open_bug51800_right2.phpt M ext/standard/tests/streams/proc_open_bug69900.phpt Diff: diff --git a/ext/standard/tests/general_functions/proc_open_pipes1.phpt b/ext/standard/tests/general_functions/proc_open_pipes1.phpt index f6472e2..dc10428 100644 --- a/ext/standard/tests/general_functions/proc_open_pipes1.phpt +++ b/ext/standard/tests/general_functions/proc_open_pipes1.phpt @@ -11,7 +11,7 @@ for ($i = 3; $i<= 30; $i++) { $php = getenv("TEST_PHP_EXECUTABLE"); $callee = create_sleep_script(); -proc_open("$php $callee", $spec, $pipes); +proc_open("$php -n $callee", $spec, $pipes); var_dump(count($spec)); var_dump($pipes); diff --git a/ext/standard/tests/general_functions/proc_open_pipes2.phpt b/ext/standard/tests/general_functions/proc_open_pipes2.phpt index b07a19e..a232d53 100644 --- a/ext/standard/tests/general_functions/proc_open_pipes2.phpt +++ b/ext/standard/tests/general_functions/proc_open_pipes2.phpt @@ -9,7 +9,7 @@ $spec = array(); $php = getenv("TEST_PHP_EXECUTABLE"); $callee = create_sleep_script(); -proc_open("$php $callee", $spec, $pipes); +proc_open("$php -n $callee", $spec, $pipes); var_dump(count($spec)); var_dump($pipes); diff --git a/ext/standard/tests/general_functions/proc_open_pipes3.phpt b/ext/standard/tests/general_functions/proc_open_pipes3.phpt index 2ddcd27..6e90471 100644 --- a/ext/standard/tests/general_functions/proc_open_pipes3.phpt +++ b/ext/standard/tests/general_functions/proc_open_pipes3.phpt @@ -13,17 +13,17 @@ $php = getenv("TEST_PHP_EXECUTABLE"); $callee = create_sleep_script(); $spec[$i] = array('pi'); -proc_open("$php $callee", $spec, $pipes); +proc_open("$php -n $callee", $spec, $pipes); $spec[$i] = 1; -proc_open("$php $callee", $spec, $pipes); +proc_open("$php -n $callee", $spec, $pipes); $spec[$i] = array('pipe', "test"); -proc_open("$php $callee", $spec, $pipes); +proc_open("$php -n $callee", $spec, $pipes); var_dump($pipes); $spec[$i] = array('file', "test", "z"); -proc_open("$php $callee", $spec, $pipes); +proc_open("$php -n $callee", $spec, $pipes); var_dump($pipes); echo "END\n"; diff --git a/ext/standard/tests/streams/proc_open_bug51800_right.phpt b/ext/standard/tests/streams/proc_open_bug51800_right.phpt index b14fed2..efff8e7 100644 --- a/ext/standard/tests/streams/proc_open_bug51800_right.phpt +++ b/ext/standard/tests/streams/proc_open_bug51800_right.phpt @@ -4,7 +4,7 @@ Bug #51800 proc_open on Windows hangs forever, the right way to do it <?php $callee = dirname(__FILE__) . "/process_proc_open_bug51800_right.php"; $php = PHP_BINARY; -$cmd = "$php $callee"; +$cmd = "$php -n $callee"; $status; $stdout = ""; diff --git a/ext/standard/tests/streams/proc_open_bug51800_right2.phpt b/ext/standard/tests/streams/proc_open_bug51800_right2.phpt index 1e74274..8e7c7df 100644 --- a/ext/standard/tests/streams/proc_open_bug51800_right2.phpt +++ b/ext/standard/tests/streams/proc_open_bug51800_right2.phpt @@ -4,7 +4,7 @@ Bug #51800 proc_open on Windows hangs forever, the right way to do it with more <?php $callee = dirname(__FILE__) . "/process_proc_open_bug51800_right2.php"; $php = PHP_BINARY; -$cmd = "$php $callee"; +$cmd = "$php -n $callee"; $status; $stdout = ""; diff --git a/ext/standard/tests/streams/proc_open_bug69900.phpt b/ext/standard/tests/streams/proc_open_bug69900.phpt index c98fd97..86e323e 100644 --- a/ext/standard/tests/streams/proc_open_bug69900.phpt +++ b/ext/standard/tests/streams/proc_open_bug69900.phpt @@ -22,7 +22,7 @@ file_put_contents($fl, $test_content); $descriptorspec = array(0 => array("pipe", "r"),1 => array("pipe", "w")); $pipes = array(); -$process = proc_open(PHP_BINARY.' -f ' . $fl, $descriptorspec, $pipes, NULL, NULL, array("blocking_pipes" => true)); +$process = proc_open(PHP_BINARY.' -n -f ' . $fl, $descriptorspec, $pipes, NULL, NULL, array("blocking_pipes" => true)); for($i = 0; $i < 10; $i++){ fwrite($pipes[0], "hello$i\r\n");