diff options
| -rwxr-xr-x | run-tests.php | 7 | ||||
| -rw-r--r-- | tests/run-test/test010.phpt | 17 |
2 files changed, 22 insertions, 2 deletions
diff --git a/run-tests.php b/run-tests.php index a48ee69f2e..cacf1760c8 100755 --- a/run-tests.php +++ b/run-tests.php @@ -837,7 +837,7 @@ function error_report($testname, $logname, $tested) } } -function system_with_timeout($commandline, $env = null) +function system_with_timeout($commandline, $env = null, $stdin = null) { global $leak_check; @@ -852,6 +852,9 @@ function system_with_timeout($commandline, $env = null) if (!$proc) return false; + if (is_string($stdin)) { + fwrite($pipes[0], $stdin); + } fclose($pipes[0]); while (true) { @@ -1347,7 +1350,7 @@ SCRIPT_FILENAME = " . $env['SCRIPT_FILENAME'] . " COMMAND $cmd "; - $out = system_with_timeout($cmd, $env); + $out = system_with_timeout($cmd, $env, isset($section_text['STDIN']) ? $section_text['STDIN'] : null); if (array_key_exists('CLEAN', $section_text) && (!$no_clean || $cfg['keep']['clean'])) { if (trim($section_text['CLEAN'])) { diff --git a/tests/run-test/test010.phpt b/tests/run-test/test010.phpt new file mode 100644 index 0000000000..cc3ca3591e --- /dev/null +++ b/tests/run-test/test010.phpt @@ -0,0 +1,17 @@ +--TEST-- +STDIN input +--FILE-- +<?php +var_dump(stream_get_contents(STDIN)); +var_dump(stream_get_contents(fopen('php://stdin', 'r'))); +var_dump(file_get_contents('php://stdin')); +?> +--STDIN-- +fooBar +use this to input some thing to the php script +--EXPECT-- +string(54) "fooBar +use this to input some thing to the php script +" +string(0) "" +string(0) "" |