From 91d3cd85593a19ff6ab3c334f74198472788021d Mon Sep 17 00:00:00 2001
From: Anatol Belski <ab@php.net>
Date: Mon, 29 Sep 2014 18:11:06 +0200
Subject: [PATCH 1/2] better test cleanup

and even force the XFAIL to fail as it would take too long anyway, even if it passes
---
 ext/standard/tests/streams/proc_open_bug51800.phpt     | 10 +++++++---
 .../tests/streams/proc_open_bug51800_right.phpt        |  9 ++++++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/ext/standard/tests/streams/proc_open_bug51800.phpt b/ext/standard/tests/streams/proc_open_bug51800.phpt
index 024d9cd6c69..53cafd85551 100644
--- a/ext/standard/tests/streams/proc_open_bug51800.phpt
+++ b/ext/standard/tests/streams/proc_open_bug51800.phpt
@@ -2,6 +2,7 @@
 Bug #51800 proc_open on Windows hangs forever
 --SKIPIF--
 <?php
+	echo 'skip expected to fail or take too long';
 	if (getenv("SKIP_SLOW_TESTS")) {
 		die("skip slow test");
 	}
@@ -17,7 +18,7 @@ so then the pipe buffer is emptied more often and the child has chance to contin
 write. The behaviour might look some better if write/read in a separate thread, however
 this is much more resource greedy and complexer to integrate into the user script. */
 
-$callee = dirname(__FILE__) . "/process" . md5(uniqid()) . ".php";
+$callee = dirname(__FILE__) . "/process_proc_open_bug51800.php";
 $php = PHP_BINARY;
 $cmd = "$php $callee";
 
@@ -72,10 +73,13 @@ var_dump(array(
         "stderr" => $stderr,
 ), strlen($stdout), strlen($stderr));
 
-unlink($callee);
-
 ?>
 ===DONE===
+--CLEAN--
+<?php
+$callee = dirname(__FILE__) . "/process_proc_open_bug51800.php";
+unlink($callee);
+?>
 --EXPECTF--
 array(3) {
   ["status"]=>
diff --git a/ext/standard/tests/streams/proc_open_bug51800_right.phpt b/ext/standard/tests/streams/proc_open_bug51800_right.phpt
index bab37a8ba41..b14fed2e5df 100644
--- a/ext/standard/tests/streams/proc_open_bug51800_right.phpt
+++ b/ext/standard/tests/streams/proc_open_bug51800_right.phpt
@@ -2,7 +2,7 @@
 Bug #51800 proc_open on Windows hangs forever, the right way to do it
 --FILE--
 <?php
-$callee = dirname(__FILE__) . "/process" . md5(uniqid()) . ".php";
+$callee = dirname(__FILE__) . "/process_proc_open_bug51800_right.php";
 $php = PHP_BINARY;
 $cmd = "$php $callee";
 
@@ -56,10 +56,13 @@ var_dump(array(
         "stderr" => $stderr,
 ), strlen($stdout), strlen($stderr));
 
-unlink($callee);
-
 ?>
 ===DONE===
+--CLEAN--
+<?php
+$callee = dirname(__FILE__) . "/process_proc_open_bug51800_right.php";
+unlink($callee);
+?>
 --EXPECTF--
 array(3) {
   ["status"]=>

From 859913f6d40611ff3987c6ddee7aa9427d94988c Mon Sep 17 00:00:00 2001
From: Anatol Belski <ab@php.net>
Date: Mon, 29 Sep 2014 18:12:25 +0200
Subject: [PATCH 2/2] fix tests on linux

---
 ext/standard/tests/streams/proc_open_bug60120.phpt | 6 +++++-
 ext/standard/tests/streams/proc_open_bug64438.phpt | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ext/standard/tests/streams/proc_open_bug60120.phpt b/ext/standard/tests/streams/proc_open_bug60120.phpt
index 978cbe62fe8..8768257a2ea 100644
--- a/ext/standard/tests/streams/proc_open_bug60120.phpt
+++ b/ext/standard/tests/streams/proc_open_bug60120.phpt
@@ -4,7 +4,11 @@ Bug #60120 proc_open hangs with stdin/out with 2048+ bytes
 <?php
 error_reporting(E_ALL);
 
-$cmd = PHP_BINARY . ' -n -r "fwrite(STDOUT, $in = file_get_contents(\'php://stdin\')); fwrite(STDERR, $in);"';
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+	$cmd = PHP_BINARY . ' -n -r "fwrite(STDOUT, $in = file_get_contents(\'php://stdin\')); fwrite(STDERR, $in);"';
+} else {
+	$cmd = PHP_BINARY . ' -n -r \'fwrite(STDOUT, $in = file_get_contents("php://stdin")); fwrite(STDERR, $in);\'';
+}
 $descriptors = array(array('pipe', 'r'), array('pipe', 'w'), array('pipe', 'w'));
 $stdin = str_repeat('*', 1024 * 16) . '!';
 $stdin = str_repeat('*', 2049 );
diff --git a/ext/standard/tests/streams/proc_open_bug64438.phpt b/ext/standard/tests/streams/proc_open_bug64438.phpt
index e3288518d7f..b3857d09d42 100644
--- a/ext/standard/tests/streams/proc_open_bug64438.phpt
+++ b/ext/standard/tests/streams/proc_open_bug64438.phpt
@@ -5,7 +5,11 @@ Bug #64438 proc_open hangs with stdin/out with 4097+ bytes
 
 error_reporting(E_ALL);
 
-$cmd = PHP_BINARY . ' -n -r "fwrite(STDOUT, $in = file_get_contents(\'php://stdin\')); fwrite(STDERR, $in);"';
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+	$cmd = PHP_BINARY . ' -n -r "fwrite(STDOUT, $in = file_get_contents(\'php://stdin\')); fwrite(STDERR, $in);"';
+} else {
+	$cmd = PHP_BINARY . ' -n -r \'fwrite(STDOUT, $in = file_get_contents("php://stdin")); fwrite(STDERR, $in);\'';
+}
 $descriptors = array(array('pipe', 'r'), array('pipe', 'w'), array('pipe', 'w'));
 $stdin = str_repeat('*', 4097);