rasmus Mon Jun 30 14:22:53 2003 EDT
Modified files:
/php-src/ext/standard/tests/general_functions getopt.phpt
/php-src/tests/basic 012.phpt
/php-src/tests/lang bug21800.phpt
Log:
Fix 3 tests that didn't adequately specify the .ini settings they rely on
Index: php-src/ext/standard/tests/general_functions/getopt.phpt
diff -u php-src/ext/standard/tests/general_functions/getopt.phpt:1.2
php-src/ext/standard/tests/general_functions/getopt.phpt:1.3
--- php-src/ext/standard/tests/general_functions/getopt.phpt:1.2 Sun Feb 9
08:23:50 2003
+++ php-src/ext/standard/tests/general_functions/getopt.phpt Mon Jun 30 14:22:52
2003
@@ -2,13 +2,13 @@
getopt
--ARGS--
-v -h -d test -m 1234 -t -j
+--INI--
+register_argc_argv=On
+variables_order=GPS
--SKIPIF--
<?php
if (substr(PHP_OS, 0, 3) == 'WIN') {
die('skip getopt() is currently not available on Windows');
- }
- if (!ini_get('register_argc_argv')) {
- die("skip this test needs register_argc_argv to be enabled");
}
?>
--FILE--
Index: php-src/tests/basic/012.phpt
diff -u php-src/tests/basic/012.phpt:1.1 php-src/tests/basic/012.phpt:1.2
--- php-src/tests/basic/012.phpt:1.1 Wed Aug 21 19:10:44 2002
+++ php-src/tests/basic/012.phpt Mon Jun 30 14:22:53 2003
@@ -4,6 +4,7 @@
<?php if(php_sapi_name()!='cli') echo 'skip'; ?>
--INI--
register_argc_argv=1
+variables_order=GPS
--ARGS--
ab cd ef 123 test
--FILE--
Index: php-src/tests/lang/bug21800.phpt
diff -u php-src/tests/lang/bug21800.phpt:1.1 php-src/tests/lang/bug21800.phpt:1.2
--- php-src/tests/lang/bug21800.phpt:1.1 Tue Jan 21 14:38:08 2003
+++ php-src/tests/lang/bug21800.phpt Mon Jun 30 14:22:53 2003
@@ -4,7 +4,8 @@
<?php (PHP_SAPI != 'cli') and print "SKIP PHP binary is not cli"; ?>
--FILE--
<?php
-$fh = popen("{$_ENV['TEST_PHP_EXECUTABLE']} -a", 'w');
+$exe = getenv('TEST_PHP_EXECUTABLE');
+$fh = popen("$exe -a", 'w');
if ($fh !== false) {
fwrite($fh, "<?php echo ':test:'; ?>\n\n");
fclose($fh);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
