Replace bug70018 test (broken on non-GNU) with win32 version

diff --git a/ext/standard/tests/general_functions/bug70018-win32.phpt b/ext/standard/tests/general_functions/bug70018-win32.phpt
deleted file mode 100644 (file)
index 427d816..0000000
--- a/ext/standard/tests/general_functions/bug70018-win32.phpt
+++ /dev/null
@@ -1,31 +0,0 @@
---TEST--
-Bug #70018 (exec does not strip all whitespace), var 2
---SKIPIF--
-<?php
-if (substr(PHP_OS, 0, 3) != "WIN") {
-  die("skip.. only for Windows");
-}
-if ("cli" != php_sapi_name()) {
-  die("skip.. CLI only test");
-}
-?>
---FILE--
-<?php
-$output = array();
-
-$test_fl = dirname(__FILE__) . DIRECTORY_SEPARATOR . md5(uniqid());
-file_put_contents($test_fl, '<?php echo "abc\f\n \n";');
-
-exec(PHP_BINARY . " -n $test_fl", $output);
-
-var_dump($output);
-
-@unlink($test_fl);
-?>
---EXPECT--
-array(2) {
-  [0]=>
-  string(3) "abc"
-  [1]=>
-  string(0) ""
-}

diff --git a/ext/standard/tests/general_functions/bug70018.phpt b/ext/standard/tests/general_functions/bug70018.phpt
index 86850060928864ae2379b0152925e2336734710e..d4c38b9d8a8867c272b9c8a490bd38dc27e57a3c 100644 (file)
--- a/ext/standard/tests/general_functions/bug70018.phpt
+++ b/ext/standard/tests/general_functions/bug70018.phpt
@@ -1,16 +1,23 @@
 --TEST--
-Bug #70018 (exec does not strip all whitespace), var 1
+Bug #70018 (exec does not strip all whitespace)
 --SKIPIF--
 <?php
-if (substr(PHP_OS, 0, 3) == "WIN") {
-  die("skip.. not for Windows");
+if ("cli" != php_sapi_name()) {
+  die("skip.. CLI only test");
 }
 ?>
 --FILE--
 <?php
 $output = array();
-exec('/bin/echo -n -e "abc\f\n \n"',$output);
+
+$test_fl = dirname(__FILE__) . DIRECTORY_SEPARATOR . md5(uniqid());
+file_put_contents($test_fl, '<?php echo "abc\f\n \n";');
+
+exec(PHP_BINARY . " -n $test_fl", $output);
+
 var_dump($output);
+
+@unlink($test_fl);
 ?>
 --EXPECT--
 array(2) {