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

Merge branch 'PHP-7.0' into PHP-7.1

Browse Source 
* PHP-7.0:
  explicitly ignore php.ini for proc open tests
This commit is contained in:
Anatol Belski
2017-03-21 12:44:36 +01:00
parent 2b7c3831cd bc2b500d3e
commit 9e3672eaef
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ext/standard/tests/general_functions/proc_open_pipes1.phpt
View File

@@ -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);

2
ext/standard/tests/general_functions/proc_open_pipes2.phpt
View File

@@ -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);

8
ext/standard/tests/general_functions/proc_open_pipes3.phpt
View File

@@ -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";

2
ext/standard/tests/streams/proc_open_bug51800_right.phpt
View File

@@ -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 = "";

2
ext/standard/tests/streams/proc_open_bug51800_right2.phpt
View File

@@ -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 = "";

2
ext/standard/tests/streams/proc_open_bug69900.phpt
View File

@@ -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");