jani Thu Aug 14 20:51:35 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/sapi/cgi/tests 005.phpt 006.phpt 007.phpt include.inc /php-src/sapi/cli/tests 009.phpt 015.phpt 021.phpt Log: fix tests http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/tests/005.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u Index: php-src/sapi/cgi/tests/005.phpt diff -u php-src/sapi/cgi/tests/005.phpt:1.1.2.2 php-src/sapi/cgi/tests/005.phpt:1.1.2.2.2.1 --- php-src/sapi/cgi/tests/005.phpt:1.1.2.2 Tue Apr 17 19:49:26 2007 +++ php-src/sapi/cgi/tests/005.phpt Thu Aug 14 20:51:35 2008 @@ -10,15 +10,12 @@ $php = get_cgi_path(); reset_env_vars(); -var_dump(`$php -n -c -f 'wrong'`); var_dump(`$php -n -a -f 'wrong'`); var_dump(`$php -n -f 'wrong' -a`); echo "Done\n"; ?> --EXPECTF-- -string(55) "You cannot use both -n and -c switch. Use -h for help. -" string(51) "No input file specified. Interactive mode enabled http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/tests/006.phpt?r1=1.1.2.3&r2=1.1.2.3.2.1&diff_format=u Index: php-src/sapi/cgi/tests/006.phpt diff -u php-src/sapi/cgi/tests/006.phpt:1.1.2.3 php-src/sapi/cgi/tests/006.phpt:1.1.2.3.2.1 --- php-src/sapi/cgi/tests/006.phpt:1.1.2.3 Tue Apr 17 20:17:25 2007 +++ php-src/sapi/cgi/tests/006.phpt Thu Aug 14 20:51:35 2008 @@ -42,7 +42,7 @@ file_put_contents($filename, $code); -var_dump(`"$php" -n -l "$filename" 2>/dev/null`); +var_dump(`"$php" -l "$filename" 2>/dev/null`); @unlink($filename); http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/tests/007.phpt?r1=1.1.2.2.2.1&r2=1.1.2.2.2.2&diff_format=u Index: php-src/sapi/cgi/tests/007.phpt diff -u php-src/sapi/cgi/tests/007.phpt:1.1.2.2.2.1 php-src/sapi/cgi/tests/007.phpt:1.1.2.2.2.2 --- php-src/sapi/cgi/tests/007.phpt:1.1.2.2.2.1 Sun Mar 16 21:06:54 2008 +++ php-src/sapi/cgi/tests/007.phpt Thu Aug 14 20:51:35 2008 @@ -10,7 +10,7 @@ reset_env_vars(); var_dump(`"$php" -n -f some.php -f some.php`); -var_dump(`"$php" -s -w -l`); +var_dump(`"$php" -n -s -w -l`); ?> ===DONE=== http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/tests/include.inc?r1=1.1.2.3&r2=1.1.2.3.2.1&diff_format=u Index: php-src/sapi/cgi/tests/include.inc diff -u php-src/sapi/cgi/tests/include.inc:1.1.2.3 php-src/sapi/cgi/tests/include.inc:1.1.2.3.2.1 --- php-src/sapi/cgi/tests/include.inc:1.1.2.3 Sun May 27 19:23:09 2007 +++ php-src/sapi/cgi/tests/include.inc Thu Aug 14 20:51:35 2008 @@ -8,7 +8,7 @@ $cgi = false; if (file_exists($php) && is_executable($php)) { - $version = `$php -v`; + $version = `$php -n -v`; if (strstr($version, "(cli)")) { /* that's cli */ $cli = true; http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/009.phpt?r1=1.1.2.5&r2=1.1.2.5.2.1&diff_format=u Index: php-src/sapi/cli/tests/009.phpt diff -u php-src/sapi/cli/tests/009.phpt:1.1.2.5 php-src/sapi/cli/tests/009.phpt:1.1.2.5.2.1 --- php-src/sapi/cli/tests/009.phpt:1.1.2.5 Thu Apr 19 07:00:40 2007 +++ php-src/sapi/cli/tests/009.phpt Thu Aug 14 20:51:35 2008 @@ -7,15 +7,12 @@ $php = getenv('TEST_PHP_EXECUTABLE'); -var_dump(`$php -n -c -r "echo hello;"`); var_dump(`$php -n -a -r "echo hello;"`); var_dump(`$php -n -r "echo hello;" -a`); echo "Done\n"; ?> --EXPECTF-- -You cannot use both -n and -c switch. Use -h for help. -NULL Either execute direct code, process stdin or use a file. NULL Either execute direct code, process stdin or use a file. http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/015.phpt?r1=1.1.2.5&r2=1.1.2.5.2.1&diff_format=u Index: php-src/sapi/cli/tests/015.phpt diff -u php-src/sapi/cli/tests/015.phpt:1.1.2.5 php-src/sapi/cli/tests/015.phpt:1.1.2.5.2.1 --- php-src/sapi/cli/tests/015.phpt:1.1.2.5 Fri Jun 1 22:18:56 2007 +++ php-src/sapi/cli/tests/015.phpt Thu Aug 14 20:51:35 2008 @@ -13,10 +13,10 @@ $php = getenv('TEST_PHP_EXECUTABLE'); -echo `"$php" --version | grep built:`; -echo `echo "<?php print_r(\\\$argv);" | "$php" -- foo bar baz`, "\n"; -echo `"$php" --version foo bar baz | grep built:`; -echo `"$php" --notexisting foo bar baz | grep Usage:`; +echo `"$php" -n --version | grep built:`; +echo `echo "<?php print_r(\\\$argv);" | "$php" -n -- foo bar baz`, "\n"; +echo `"$php" -n --version foo bar baz | grep built:`; +echo `"$php" -n --notexisting foo bar baz | grep Usage:`; echo "Done\n"; ?> http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/021.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u Index: php-src/sapi/cli/tests/021.phpt diff -u php-src/sapi/cli/tests/021.phpt:1.1.2.1 php-src/sapi/cli/tests/021.phpt:1.1.2.2 --- php-src/sapi/cli/tests/021.phpt:1.1.2.1 Sun Jul 6 16:59:39 2008 +++ php-src/sapi/cli/tests/021.phpt Thu Aug 14 20:51:35 2008 @@ -14,7 +14,7 @@ $filename = __DIR__.'/021.tmp.php'; -$script = "#!$php\n". +$script = "#!$php -n\n". "ola\n". "<?php echo 1+1,'\n';\n". "?>\n".
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php