tony2001 Mon Dec 4 17:48:52 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/sapi/cli/tests 002-win32.phpt 002.phpt 004.phpt 005.phpt 006.phpt 007.phpt 008.phpt 009.phpt 010-2.phpt 010.phpt 011.phpt 012.phpt 013.phpt Log: fix tests
http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/002-win32.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/sapi/cli/tests/002-win32.phpt diff -u php-src/sapi/cli/tests/002-win32.phpt:1.1.2.2 php-src/sapi/cli/tests/002-win32.phpt:1.1.2.3 --- php-src/sapi/cli/tests/002-win32.phpt:1.1.2.2 Fri Nov 24 13:33:38 2006 +++ php-src/sapi/cli/tests/002-win32.phpt Mon Dec 4 17:48:52 2006 @@ -12,7 +12,7 @@ $php = $_ENV['TEST_PHP_EXECUTABLE']; -var_dump(`$php -r "var_dump('hello');"`); +var_dump(`$php -n -r "var_dump('hello');"`); echo "Done\n"; ?> http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/002.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/sapi/cli/tests/002.phpt diff -u php-src/sapi/cli/tests/002.phpt:1.1.2.2 php-src/sapi/cli/tests/002.phpt:1.1.2.3 --- php-src/sapi/cli/tests/002.phpt:1.1.2.2 Fri Nov 24 13:33:38 2006 +++ php-src/sapi/cli/tests/002.phpt Mon Dec 4 17:48:52 2006 @@ -12,7 +12,7 @@ $php = $_ENV['TEST_PHP_EXECUTABLE']; -var_dump(`$php -r 'var_dump("hello");'`); +var_dump(`$php -n -r 'var_dump("hello");'`); echo "Done\n"; ?> http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/004.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/sapi/cli/tests/004.phpt diff -u php-src/sapi/cli/tests/004.phpt:1.1.2.2 php-src/sapi/cli/tests/004.phpt:1.1.2.3 --- php-src/sapi/cli/tests/004.phpt:1.1.2.2 Fri Nov 24 13:33:38 2006 +++ php-src/sapi/cli/tests/004.phpt Mon Dec 4 17:48:52 2006 @@ -7,9 +7,9 @@ $php = $_ENV['TEST_PHP_EXECUTABLE']; -var_dump(`$php --rf unknown`); -var_dump(`$php --rf echo`); -var_dump(`$php --rf phpinfo`); +var_dump(`$php -n --rf unknown`); +var_dump(`$php -n --rf echo`); +var_dump(`$php -n --rf phpinfo`); echo "Done\n"; ?> http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/005.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/sapi/cli/tests/005.phpt diff -u php-src/sapi/cli/tests/005.phpt:1.1.2.2 php-src/sapi/cli/tests/005.phpt:1.1.2.3 --- php-src/sapi/cli/tests/005.phpt:1.1.2.2 Fri Nov 24 13:33:38 2006 +++ php-src/sapi/cli/tests/005.phpt Mon Dec 4 17:48:52 2006 @@ -7,9 +7,9 @@ $php = $_ENV['TEST_PHP_EXECUTABLE']; -var_dump(`$php --rc unknown`); -var_dump(`$php --rc stdclass`); -var_dump(`$php --rc exception`); +var_dump(`$php -n --rc unknown`); +var_dump(`$php -n --rc stdclass`); +var_dump(`$php -n --rc exception`); echo "Done\n"; ?> http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/006.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/sapi/cli/tests/006.phpt diff -u php-src/sapi/cli/tests/006.phpt:1.1.2.2 php-src/sapi/cli/tests/006.phpt:1.1.2.3 --- php-src/sapi/cli/tests/006.phpt:1.1.2.2 Fri Nov 24 13:33:38 2006 +++ php-src/sapi/cli/tests/006.phpt Mon Dec 4 17:48:52 2006 @@ -7,8 +7,8 @@ $php = $_ENV['TEST_PHP_EXECUTABLE']; -var_dump(`$php --re unknown`); -var_dump(`$php --re ""`); +var_dump(`$php -n --re unknown`); +var_dump(`$php -n --re ""`); var_dump(`$php -n --re date`); echo "Done\n"; http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/007.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/sapi/cli/tests/007.phpt diff -u php-src/sapi/cli/tests/007.phpt:1.1.2.2 php-src/sapi/cli/tests/007.phpt:1.1.2.3 --- php-src/sapi/cli/tests/007.phpt:1.1.2.2 Fri Nov 24 13:33:38 2006 +++ php-src/sapi/cli/tests/007.phpt Mon Dec 4 17:48:52 2006 @@ -32,9 +32,9 @@ file_put_contents($filename, $code); -var_dump(`$php -w "$filename"`); -var_dump(`$php -w "wrong"`); -var_dump(`echo "<?php /* comment */ class test {\n // comment \n function foo() {} } ?>" | $php -w`); +var_dump(`$php -n -w "$filename"`); +var_dump(`$php -n -w "wrong"`); +var_dump(`echo "<?php /* comment */ class test {\n // comment \n function foo() {} } ?>" | $php -n -w`); @unlink($filename); http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/008.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/sapi/cli/tests/008.phpt diff -u php-src/sapi/cli/tests/008.phpt:1.1.2.2 php-src/sapi/cli/tests/008.phpt:1.1.2.3 --- php-src/sapi/cli/tests/008.phpt:1.1.2.2 Fri Nov 24 13:33:38 2006 +++ php-src/sapi/cli/tests/008.phpt Mon Dec 4 17:48:52 2006 @@ -26,8 +26,8 @@ file_put_contents($filename, $code); -var_dump(`$php -f "$filename"`); -var_dump(`$php -f "wrong"`); +var_dump(`$php -n -f "$filename"`); +var_dump(`$php -n -f "wrong"`); @unlink($filename); http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/009.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/sapi/cli/tests/009.phpt diff -u php-src/sapi/cli/tests/009.phpt:1.1.2.2 php-src/sapi/cli/tests/009.phpt:1.1.2.3 --- php-src/sapi/cli/tests/009.phpt:1.1.2.2 Fri Nov 24 13:33:38 2006 +++ php-src/sapi/cli/tests/009.phpt Mon Dec 4 17:48:52 2006 @@ -8,8 +8,8 @@ $php = $_ENV['TEST_PHP_EXECUTABLE']; var_dump(`$php -n -c -r 'echo hello;'`); -var_dump(`$php -a -r 'echo hello;'`); -var_dump(`$php -r 'echo hello;' -a`); +var_dump(`$php -n -a -r 'echo hello;'`); +var_dump(`$php -n -r 'echo hello;' -a`); echo "Done\n"; ?> http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/010-2.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/sapi/cli/tests/010-2.phpt diff -u php-src/sapi/cli/tests/010-2.phpt:1.1.2.2 php-src/sapi/cli/tests/010-2.phpt:1.1.2.3 --- php-src/sapi/cli/tests/010-2.phpt:1.1.2.2 Fri Nov 24 13:33:38 2006 +++ php-src/sapi/cli/tests/010-2.phpt Mon Dec 4 17:48:52 2006 @@ -21,7 +21,7 @@ file_put_contents($filename_txt, $txt); -var_dump(`cat "$filename_txt" | "$php" -R "var_dump(1);"`); +var_dump(`cat "$filename_txt" | "$php" -n -R "var_dump(1);"`); @unlink($filename_txt); http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/010.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/sapi/cli/tests/010.phpt diff -u php-src/sapi/cli/tests/010.phpt:1.1.2.2 php-src/sapi/cli/tests/010.phpt:1.1.2.3 --- php-src/sapi/cli/tests/010.phpt:1.1.2.2 Fri Nov 24 13:33:38 2006 +++ php-src/sapi/cli/tests/010.phpt Mon Dec 4 17:48:52 2006 @@ -30,7 +30,7 @@ file_put_contents($filename_txt, $txt); -var_dump(`cat "$filename_txt" | "$php" -F "$filename"`); +var_dump(`cat "$filename_txt" | "$php" -n -F "$filename"`); @unlink($filename); @unlink($filename_txt); http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/011.phpt?r1=1.1.2.3&r2=1.1.2.4&diff_format=u Index: php-src/sapi/cli/tests/011.phpt diff -u php-src/sapi/cli/tests/011.phpt:1.1.2.3 php-src/sapi/cli/tests/011.phpt:1.1.2.4 --- php-src/sapi/cli/tests/011.phpt:1.1.2.3 Fri Nov 24 13:40:43 2006 +++ php-src/sapi/cli/tests/011.phpt Mon Dec 4 17:48:52 2006 @@ -25,8 +25,8 @@ file_put_contents($filename, $code); -var_dump(`"$php" -l "$filename"`); -var_dump(`"$php" -l some.unknown`); +var_dump(`"$php" -n -l "$filename"`); +var_dump(`"$php" -n -l some.unknown`); $code = ' <?php @@ -40,7 +40,7 @@ file_put_contents($filename, $code); -var_dump(`"$php" -l "$filename"`); +var_dump(`"$php" -n -l "$filename"`); @unlink($filename); http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/012.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/sapi/cli/tests/012.phpt diff -u php-src/sapi/cli/tests/012.phpt:1.1.2.2 php-src/sapi/cli/tests/012.phpt:1.1.2.3 --- php-src/sapi/cli/tests/012.phpt:1.1.2.2 Fri Nov 24 13:33:38 2006 +++ php-src/sapi/cli/tests/012.phpt Mon Dec 4 17:48:52 2006 @@ -7,14 +7,14 @@ $php = $_ENV['TEST_PHP_EXECUTABLE']; -var_dump(`"$php" -F some.php -F some.php`); -var_dump(`"$php" -F some.php -R some.php`); -var_dump(`"$php" -R some.php -F some.php`); -var_dump(`"$php" -R some.php -R some.php`); -var_dump(`"$php" -f some.php -f some.php`); -var_dump(`"$php" -B '' -B ''`); -var_dump(`"$php" -E '' -E ''`); -var_dump(`"$php" -r "" -r ""`); +var_dump(`"$php" -n -F some.php -F some.php`); +var_dump(`"$php" -n -F some.php -R some.php`); +var_dump(`"$php" -n -R some.php -F some.php`); +var_dump(`"$php" -n -R some.php -R some.php`); +var_dump(`"$php" -n -f some.php -f some.php`); +var_dump(`"$php" -n -B '' -B ''`); +var_dump(`"$php" -n -E '' -E ''`); +var_dump(`"$php" -n -r "" -r ""`); echo "Done\n"; ?> http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/013.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u Index: php-src/sapi/cli/tests/013.phpt diff -u php-src/sapi/cli/tests/013.phpt:1.1.2.2 php-src/sapi/cli/tests/013.phpt:1.1.2.3 --- php-src/sapi/cli/tests/013.phpt:1.1.2.2 Fri Nov 24 13:33:38 2006 +++ php-src/sapi/cli/tests/013.phpt Mon Dec 4 17:48:52 2006 @@ -15,9 +15,9 @@ $filename_txt = dirname(__FILE__)."/013.test.txt"; file_put_contents($filename_txt, "test\nfile\ncontents\n"); -var_dump(`cat "$filename_txt" | "$php" -B 'var_dump("start");'`); -var_dump(`cat "$filename_txt" | "$php" -E 'var_dump("end");'`); -var_dump(`cat "$filename_txt" | "$php" -B 'var_dump("start");' -E 'var_dump("end");'`); +var_dump(`cat "$filename_txt" | "$php" -n -B 'var_dump("start");'`); +var_dump(`cat "$filename_txt" | "$php" -n -E 'var_dump("end");'`); +var_dump(`cat "$filename_txt" | "$php" -n -B 'var_dump("start");' -E 'var_dump("end");'`); @unlink($filename_txt);
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php