From bc2b500d3e35de1a0916a122f9dab306286d1d77 Mon Sep 17 00:00:00 2001
From: Anatol Belski <ab@php.net>
Date: Tue, 21 Mar 2017 12:39:40 +0100
Subject: 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.
---
 ext/standard/tests/general_functions/proc_open_pipes1.phpt | 2 +-
 ext/standard/tests/general_functions/proc_open_pipes2.phpt | 2 +-
 ext/standard/tests/general_functions/proc_open_pipes3.phpt | 8 ++++----
 ext/standard/tests/streams/proc_open_bug51800_right.phpt   | 2 +-
 ext/standard/tests/streams/proc_open_bug51800_right2.phpt  | 2 +-
 ext/standard/tests/streams/proc_open_bug69900.phpt         | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ext/standard/tests/general_functions/proc_open_pipes1.phpt b/ext/standard/tests/general_functions/proc_open_pipes1.phpt
index f6472e2f99..dc104283eb 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 b07a19e143..a232d53dd7 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 2ddcd276d7..6e90471bdc 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 b14fed2e5d..efff8e7110 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 1e742745c1..8e7c7df2c9 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 c98fd97eb4..86e323eb05 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");
-- 
cgit v1.2.1