tony2001 Sat Jan 20 22:12:45 2007 UTC Modified files: /php-src/sapi/cli/tests 001.phpt 002.phpt 003.phpt 004.phpt 005.phpt 006.phpt 007.phpt 008.phpt 009.phpt 010-2.phpt 010.phpt 011.phpt 012.phpt 013.phpt 014.phpt Log: use getenv() http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/001.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/sapi/cli/tests/001.phpt diff -u php-src/sapi/cli/tests/001.phpt:1.1 php-src/sapi/cli/tests/001.phpt:1.2 --- php-src/sapi/cli/tests/001.phpt:1.1 Fri Nov 24 13:32:07 2006 +++ php-src/sapi/cli/tests/001.phpt Sat Jan 20 22:12:45 2007 @@ -5,7 +5,7 @@ --FILE-- <?php -$php = $_ENV['TEST_PHP_EXECUTABLE']; +$php = getenv('TEST_PHP_EXECUTABLE'); var_dump(`"$php" -n -v`); http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/002.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/sapi/cli/tests/002.phpt diff -u php-src/sapi/cli/tests/002.phpt:1.2 php-src/sapi/cli/tests/002.phpt:1.3 --- php-src/sapi/cli/tests/002.phpt:1.2 Mon Dec 4 17:48:27 2006 +++ php-src/sapi/cli/tests/002.phpt Sat Jan 20 22:12:45 2007 @@ -10,7 +10,7 @@ --FILE-- <?php -$php = $_ENV['TEST_PHP_EXECUTABLE']; +$php = getenv('TEST_PHP_EXECUTABLE'); var_dump(`"$php" -n -r 'var_dump("hello");'`); http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/003.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/sapi/cli/tests/003.phpt diff -u php-src/sapi/cli/tests/003.phpt:1.1 php-src/sapi/cli/tests/003.phpt:1.2 --- php-src/sapi/cli/tests/003.phpt:1.1 Fri Nov 24 13:32:07 2006 +++ php-src/sapi/cli/tests/003.phpt Sat Jan 20 22:12:45 2007 @@ -10,7 +10,7 @@ --FILE-- <?php -$php = $_ENV['TEST_PHP_EXECUTABLE']; +$php = getenv('TEST_PHP_EXECUTABLE'); var_dump(`"$php" -n -d max_execution_time=111 -r 'var_dump(ini_get("max_execution_time"));'`); var_dump(`"$php" -n -d max_execution_time=500 -r 'var_dump(ini_get("max_execution_time"));'`); http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/004.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/sapi/cli/tests/004.phpt diff -u php-src/sapi/cli/tests/004.phpt:1.2 php-src/sapi/cli/tests/004.phpt:1.3 --- php-src/sapi/cli/tests/004.phpt:1.2 Mon Dec 4 17:48:27 2006 +++ php-src/sapi/cli/tests/004.phpt Sat Jan 20 22:12:45 2007 @@ -5,7 +5,7 @@ --FILE-- <?php -$php = $_ENV['TEST_PHP_EXECUTABLE']; +$php = getenv('TEST_PHP_EXECUTABLE'); var_dump(`"$php" -n --rf unknown`); var_dump(`"$php" -n --rf echo`); http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/005.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/sapi/cli/tests/005.phpt diff -u php-src/sapi/cli/tests/005.phpt:1.2 php-src/sapi/cli/tests/005.phpt:1.3 --- php-src/sapi/cli/tests/005.phpt:1.2 Mon Dec 4 17:48:27 2006 +++ php-src/sapi/cli/tests/005.phpt Sat Jan 20 22:12:45 2007 @@ -5,7 +5,7 @@ --FILE-- <?php -$php = $_ENV['TEST_PHP_EXECUTABLE']; +$php = getenv('TEST_PHP_EXECUTABLE'); var_dump(`"$php" -n --rc unknown`); var_dump(`"$php" -n --rc stdclass`); http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/006.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/sapi/cli/tests/006.phpt diff -u php-src/sapi/cli/tests/006.phpt:1.2 php-src/sapi/cli/tests/006.phpt:1.3 --- php-src/sapi/cli/tests/006.phpt:1.2 Mon Dec 4 17:48:27 2006 +++ php-src/sapi/cli/tests/006.phpt Sat Jan 20 22:12:45 2007 @@ -5,7 +5,7 @@ --FILE-- <?php -$php = $_ENV['TEST_PHP_EXECUTABLE']; +$php = getenv('TEST_PHP_EXECUTABLE'); var_dump(`"$php" -n --re unknown`); var_dump(`"$php" -n --re ""`); http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/007.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/sapi/cli/tests/007.phpt diff -u php-src/sapi/cli/tests/007.phpt:1.2 php-src/sapi/cli/tests/007.phpt:1.3 --- php-src/sapi/cli/tests/007.phpt:1.2 Mon Dec 4 17:48:27 2006 +++ php-src/sapi/cli/tests/007.phpt Sat Jan 20 22:12:45 2007 @@ -10,7 +10,7 @@ --FILE-- <?php -$php = $_ENV['TEST_PHP_EXECUTABLE']; +$php = getenv('TEST_PHP_EXECUTABLE'); $filename = dirname(__FILE__).'/007.test.php'; $code =' http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/008.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/sapi/cli/tests/008.phpt diff -u php-src/sapi/cli/tests/008.phpt:1.2 php-src/sapi/cli/tests/008.phpt:1.3 --- php-src/sapi/cli/tests/008.phpt:1.2 Mon Dec 4 17:48:27 2006 +++ php-src/sapi/cli/tests/008.phpt Sat Jan 20 22:12:45 2007 @@ -10,7 +10,7 @@ --FILE-- <?php -$php = $_ENV['TEST_PHP_EXECUTABLE']; +$php = getenv('TEST_PHP_EXECUTABLE'); $filename = dirname(__FILE__).'/008.test.php'; $code =' http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/009.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/sapi/cli/tests/009.phpt diff -u php-src/sapi/cli/tests/009.phpt:1.2 php-src/sapi/cli/tests/009.phpt:1.3 --- php-src/sapi/cli/tests/009.phpt:1.2 Mon Dec 4 17:48:27 2006 +++ php-src/sapi/cli/tests/009.phpt Sat Jan 20 22:12:45 2007 @@ -5,7 +5,7 @@ --FILE-- <?php -$php = $_ENV['TEST_PHP_EXECUTABLE']; +$php = getenv('TEST_PHP_EXECUTABLE'); var_dump(`"$php" -n -c -r 'echo hello;'`); var_dump(`"$php" -n -a -r 'echo hello;'`); http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/010-2.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/sapi/cli/tests/010-2.phpt diff -u php-src/sapi/cli/tests/010-2.phpt:1.2 php-src/sapi/cli/tests/010-2.phpt:1.3 --- php-src/sapi/cli/tests/010-2.phpt:1.2 Mon Dec 4 17:48:27 2006 +++ php-src/sapi/cli/tests/010-2.phpt Sat Jan 20 22:12:45 2007 @@ -10,7 +10,7 @@ --FILE-- <?php -$php = $_ENV['TEST_PHP_EXECUTABLE']; +$php = getenv('TEST_PHP_EXECUTABLE'); $filename_txt = dirname(__FILE__)."/010.test.txt"; http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/010.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/sapi/cli/tests/010.phpt diff -u php-src/sapi/cli/tests/010.phpt:1.2 php-src/sapi/cli/tests/010.phpt:1.3 --- php-src/sapi/cli/tests/010.phpt:1.2 Mon Dec 4 17:48:27 2006 +++ php-src/sapi/cli/tests/010.phpt Sat Jan 20 22:12:45 2007 @@ -10,7 +10,7 @@ --FILE-- <?php -$php = $_ENV['TEST_PHP_EXECUTABLE']; +$php = getenv('TEST_PHP_EXECUTABLE'); $filename = dirname(__FILE__)."/010.test.php"; $filename_txt = dirname(__FILE__)."/010.test.txt"; http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/011.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/sapi/cli/tests/011.phpt diff -u php-src/sapi/cli/tests/011.phpt:1.4 php-src/sapi/cli/tests/011.phpt:1.5 --- php-src/sapi/cli/tests/011.phpt:1.4 Tue Dec 19 13:08:23 2006 +++ php-src/sapi/cli/tests/011.phpt Sat Jan 20 22:12:45 2007 @@ -5,7 +5,7 @@ --FILE-- <?php -$php = $_ENV['TEST_PHP_EXECUTABLE']; +$php = getenv('TEST_PHP_EXECUTABLE'); $filename = dirname(__FILE__)."/011.test.php"; http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/012.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/sapi/cli/tests/012.phpt diff -u php-src/sapi/cli/tests/012.phpt:1.2 php-src/sapi/cli/tests/012.phpt:1.3 --- php-src/sapi/cli/tests/012.phpt:1.2 Mon Dec 4 17:48:27 2006 +++ php-src/sapi/cli/tests/012.phpt Sat Jan 20 22:12:45 2007 @@ -5,7 +5,7 @@ --FILE-- <?php -$php = $_ENV['TEST_PHP_EXECUTABLE']; +$php = getenv('TEST_PHP_EXECUTABLE'); var_dump(`"$php" -n -F some.php -F some.php`); var_dump(`"$php" -n -F some.php -R some.php`); http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/013.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/sapi/cli/tests/013.phpt diff -u php-src/sapi/cli/tests/013.phpt:1.2 php-src/sapi/cli/tests/013.phpt:1.3 --- php-src/sapi/cli/tests/013.phpt:1.2 Mon Dec 4 17:48:27 2006 +++ php-src/sapi/cli/tests/013.phpt Sat Jan 20 22:12:45 2007 @@ -10,7 +10,7 @@ --FILE-- <?php -$php = $_ENV['TEST_PHP_EXECUTABLE']; +$php = getenv('TEST_PHP_EXECUTABLE'); $filename_txt = dirname(__FILE__)."/013.test.txt"; file_put_contents($filename_txt, "test\nfile\ncontents\n"); http://cvs.php.net/viewvc.cgi/php-src/sapi/cli/tests/014.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/sapi/cli/tests/014.phpt diff -u php-src/sapi/cli/tests/014.phpt:1.1 php-src/sapi/cli/tests/014.phpt:1.2 --- php-src/sapi/cli/tests/014.phpt:1.1 Fri Nov 24 13:32:07 2006 +++ php-src/sapi/cli/tests/014.phpt Sat Jan 20 22:12:45 2007 @@ -5,7 +5,7 @@ --FILE-- <?php -$php = $_ENV['TEST_PHP_EXECUTABLE']; +$php = getenv('TEST_PHP_EXECUTABLE'); $filename = dirname(__FILE__)."/014.test.php"; $code = '
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php