helly Fri Dec 30 13:42:20 2005 EDT
Modified files:
/php-src run-tests.php
Log:
- MFB
http://cvs.php.net/viewcvs.cgi/php-src/run-tests.php?r1=1.267&r2=1.268&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.267 php-src/run-tests.php:1.268
--- php-src/run-tests.php:1.267 Fri Dec 23 21:01:05 2005
+++ php-src/run-tests.php Fri Dec 30 13:42:20 2005
@@ -23,7 +23,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: run-tests.php,v 1.267 2005/12/23 21:01:05 helly Exp $ */
+/* $Id: run-tests.php,v 1.268 2005/12/30 13:42:20 helly Exp $ */
/* Sanity check to ensure that pcre extension needed by this script is
available.
* In the event it is not, print a nice error message indicating that this
script will
@@ -109,8 +109,14 @@
}
}
-if (empty($php) || !file_exists($php)) {
- error("environment variable TEST_PHP_EXECUTABLE must be set to specify
PHP executable!");
+if ($argc !=2 || ($argv[1] != '-h' && $argv[1] != '-help' && $argv !=
'--help'))
+{
+ if (empty($php) || !file_exists($php)) {
+ error("environment variable TEST_PHP_EXECUTABLE must be set to
specify PHP executable!");
+ }
+ if (function_exists('is_executable') && [EMAIL PROTECTED]($php)) {
+ error("invalid PHP executable specified by TEST_PHP_EXECUTABLE
= " . $php);
+ }
}
if (getenv('TEST_PHP_LOG_FORMAT')) {
@@ -119,10 +125,6 @@
$log_format = 'LEOD';
}
-if (function_exists('is_executable') && [EMAIL PROTECTED]($php)) {
- error("invalid PHP executable specified by TEST_PHP_EXECUTABLE = " .
$php);
-}
-
// Check whether a detailed log is wanted.
if (getenv('TEST_PHP_DETAILED')) {
$DETAILED = getenv('TEST_PHP_DETAILED');
@@ -241,6 +243,7 @@
$temp_source = null;
$temp_target = null;
$temp_urlbase = null;
+$conf_passed = null;
$cfgtypes = array('show', 'keep');
$cfgfiles = array('skip', 'php');
@@ -298,6 +301,9 @@
case 'a':
$failed_tests_file = fopen($argv[++$i],
'a+t');
break;
+ case 'c':
+ $conf_passed = $argv[++$i];
+ break;
case 'd':
$ini_overwrites[] = $argv[++$i];
break;
@@ -386,7 +392,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.267 $'."\n";
+ echo '$Revision: 1.268 $'."\n";
exit(1);
default:
echo "Illegal switch specified!\n";
@@ -410,6 +416,8 @@
-a <file> Same as -w but append rather then truncating <file>.
+ -c <file> Look for php.ini in directory <file> or use <file> as ini.
+
-n Pass -n option to the php binary (Do not use a php.ini).
-d foo=bar Pass -d option to the php binary (Define INI entry foo
@@ -464,6 +472,10 @@
}
}
}
+ if (strlen($conf_passed))
+ {
+ $pass_options .= " -c '$conf_passed'";
+ }
$test_files = array_unique($test_files);
$test_files = array_merge($test_files, $redir_tests);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
