jani Mon Jul 21 11:05:23 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src run-tests.php
Log:
- More stupid WS etc fixes. Plus the missing help text place holders for
Steph to fill up..
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.33&r2=1.226.2.37.2.35.2.34&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.33
php-src/run-tests.php:1.226.2.37.2.35.2.34
--- php-src/run-tests.php:1.226.2.37.2.35.2.33 Mon Jul 21 10:48:31 2008
+++ php-src/run-tests.php Mon Jul 21 11:05:23 2008
@@ -24,7 +24,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.33 2008/07/21 10:48:31 jani Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.34 2008/07/21 11:05:23 jani 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
@@ -116,11 +116,11 @@
$php = getenv('TEST_PHP_EXECUTABLE');
if ($php=='auto') {
- $php = $cwd.'/sapi/cli/php';
+ $php = $cwd . '/sapi/cli/php';
putenv("TEST_PHP_EXECUTABLE=$php");
if (!getenv('TEST_PHP_CGI_EXECUTABLE')) {
- $php_cgi = $cwd.'/sapi/cgi/php-cgi';
+ $php_cgi = $cwd . '/sapi/cgi/php-cgi';
if (file_exists($php_cgi)) {
putenv("TEST_PHP_CGI_EXECUTABLE=$php_cgi");
@@ -136,7 +136,7 @@
$php_cgi = getenv('TEST_PHP_CGI_EXECUTABLE');
if ($php_cgi=='auto') {
- $php_cgi = $cwd.'/sapi/cgi/php-cgi';
+ $php_cgi = $cwd . '/sapi/cgi/php-cgi';
putenv("TEST_PHP_CGI_EXECUTABLE=$php_cgi");
}
@@ -171,7 +171,7 @@
// Check whether user test dirs are requested.
if (getenv('TEST_PHP_USER')) {
- $user_tests = explode (', ', getenv('TEST_PHP_USER'));
+ $user_tests = explode (',', getenv('TEST_PHP_USER'));
} else {
$user_tests = array();
}
@@ -209,12 +209,12 @@
$info_file = __DIR__ . '/run-test-info.php';
@unlink($info_file);
$php_info = '<?php echo "
-PHP_SAPI : " . PHP_SAPI . "
-PHP_VERSION : " . phpversion() . "
-ZEND_VERSION: " . zend_version() . "
-PHP_OS : " . PHP_OS . " - " . php_uname() . "
-INI actual : " . realpath(get_cfg_var("cfg_file_path")) . "
-More .INIs : " . (function_exists(\'php_ini_scanned_files\') ?
str_replace("\n","", php_ini_scanned_files()) : "** not determined **"); ?>';
+PHP_SAPI : " , PHP_SAPI , "
+PHP_VERSION : " , phpversion() , "
+ZEND_VERSION: " , zend_version() , "
+PHP_OS : " , PHP_OS , " - " , php_uname() , "
+INI actual : " , realpath(get_cfg_var("cfg_file_path")) , "
+More .INIs : " , (function_exists(\'php_ini_scanned_files\') ?
str_replace("\n","", php_ini_scanned_files()) : "** not determined **"); ?>';
save_text($info_file, $php_info);
$info_params = array();
settings2array($ini_overwrites, $info_params);
@@ -229,10 +229,11 @@
} else {
$php_cgi_info = '';
}
+
@unlink($info_file);
// load list of enabled extensions
- save_text($info_file, '<?php echo join(",",get_loaded_extensions());
?>');
+ save_text($info_file, '<?php echo join(",", get_loaded_extensions());
?>');
$exts_to_test = explode(',',`$php $pass_options $info_params
"$info_file"`);
// check for extensions that need special handling and regenerate
$info_params_ex = array(
@@ -336,7 +337,7 @@
foreach($cfgtypes as $type) {
if (strpos($switch, '--' . $type) ===
0) {
foreach($cfgfiles as $file) {
- if ($switch == '--' .
$type.'-' . $file) {
+ if ($switch == '--' .
$type . '-' . $file) {
$cfg[$type][$file] = true;
$is_switch =
false;
break;
@@ -454,10 +455,10 @@
case '--verbose':
$DETAILED = true;
break;
- //case 'w'
case 'x':
$environment['SKIP_SLOW_TESTS'] = 1;
break;
+ //case 'w'
case '-':
// repeat check with full switch
$switch = $argv[$i];
@@ -470,7 +471,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.33
$'."\n";
+ echo '$Revision: 1.226.2.37.2.35.2.34
$'."\n";
exit(1);
case 'u':
@@ -516,6 +517,8 @@
-s <file> Write output to <file>.
+ -x FIXME: STEPH WRITES THE HELP TEXT HERE!!
+
--verbose
-v Verbose mode.
@@ -535,6 +538,9 @@
--keep-[all|php|skip|clean]
Do not delete 'all' files, 'php' test file, 'skip' or 'clean'
file.
+
+ --set-timeout
+ FIXME: STEPH WRITES THE HELP TEXT HERE!!
--show-[all|php|skip|clean|exp|diff|out]
Show 'all' files, 'php' test file, 'skip' or 'clean' file. You
@@ -1182,7 +1188,7 @@
}
fclose($fp);
- $shortname = str_replace($cwd.'/', '', $file);
+ $shortname = str_replace($cwd . '/', '', $file);
$tested_file = $shortname;
if ($borked) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
