com php-src: Fix bug #61460 popen_close_error-win32 e xpected output is wrong: ext/standard/tests/file/pope n_pclose_error-win32.phpt

Commit: 438536e45e1f762fd0f0fe7d9243adb63074e55d Author: Matt Ficken <mattficken@php.net> Tue, 3 Apr 2012 14:19:43 +0200 Committer: Anatoliy Belsky <ab@php.net> Tue, 3 Apr 2012 14:19:43 +0200 Parents: 14e74aeb579b3400bdf376b5b820fc900b4194ed Branches: PHP-5.3 PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=438536e45e1f762fd0f0fe7d9243adb63074e55d Log: Fix bug #61460 popen_close_error-win32 expected output is wrong Bugs: https://bugs.php.net/61460 Changed paths: M ext/standard/tests/file/popen_pclose_error-win32.phpt Diff: diff --git a/ext/standard/tests/file/popen_pclose_error-win32.phpt b/ext/standard/tests/file/popen_pclose_error-win32.phpt index f81cd52..9f9593c 100644 --- a/ext/standard/tests/file/popen_pclose_error-win32.phpt +++ b/ext/standard/tests/file/popen_pclose_error-win32.phpt @@ -17,7 +17,7 @@ if (PHP_DEBUG) die("skip Not Valid for debug builds"); * Description: Closes process file pointer. */ $file_path = dirname(__FILE__); -echo "*** Testing for error conditions ***\n"; +echo "*** Testing for error conditions ***" . PHP_EOL; var_dump( popen() ); // Zero Arguments var_dump( popen("abc.txt") ); // Single Argument var_dump( popen("abc.txt", "rw") ); // Invalid mode Argument @@ -26,7 +26,7 @@ $file_handle = fopen($file_path."/popen.tmp", "w"); var_dump( pclose($file_handle, $file_handle) ); pclose($file_handle); var_dump( pclose(1) ); -echo "\n--- Done ---"; +echo PHP_EOL . PHP_EOL . "--- Done ---"; ?> --CLEAN-- <?php @@ -41,9 +41,9 @@ NULL Warning: popen() expects exactly 2 parameters, 1 given in %s on line %d NULL -resource(%d) of type (stream) -'abc.txt' is not recognized as an internal or external command, -operable program or batch file. + +Warning: popen(abc.txt,rw): Invalid argument in %s on line %d +bool(false) Warning: pclose() expects exactly 1 parameter, 0 given in %s on line %d bool(false) @@ -54,4 +54,6 @@ bool(false) Warning: pclose() expects parameter 1 to be resource, integer given in %s on line %d bool(false) ---- Done --- + +--- Done ---'abc.txt' is not recognized as an internal or external command, +operable program or batch file.