cvs: php-src(PHP_5_1) / run-tests.php

helly Sun Feb 12 18:51:12 2006 UTC Modified files: (Branch: PHP_5_1) /php-src run-tests.php Log: - Synch http://cvs.php.net/viewcvs.cgi/php-src/run-tests.php?r1=1.226.2.30&r2=1.226.2.31&diff_format=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.226.2.30 php-src/run-tests.php:1.226.2.31 --- php-src/run-tests.php:1.226.2.30 Sun Feb 5 17:33:11 2006 +++ php-src/run-tests.php Sun Feb 12 18:51:12 2006 @@ -23,7 +23,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: run-tests.php,v 1.226.2.30 2006/02/05 17:33:11 iliaa Exp $ */ +/* $Id: run-tests.php,v 1.226.2.31 2006/02/12 18:51:12 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 @@ -330,6 +330,9 @@ } $pass_option_n = true; break; + case 'N': + // this is always native + break; case '--no-clean': $no_clean = true; break; @@ -384,7 +387,7 @@ $html_output = is_resource($html_file); break; case '--version': - echo '$Revision: 1.226.2.30 $'."\n"; + echo '$Revision: 1.226.2.31 $'."\n"; exit(1); default: echo "Illegal switch '$switch' specified!\n"; @@ -420,6 +423,8 @@ -m Test for memory leaks with Valgrind. + -N Always set (Test with unicode_semantics set off in PHP 6). + -s <file> Write output to <file>. -q Quite, no user interaction (same as environment NO_INTERACTION). @@ -1104,15 +1109,27 @@ } } + // Default ini settings + $ini_settings = array(); + // additional ini overwrites + //$ini_overwrites[] = 'setting=value'; + settings2array($ini_overwrites, $ini_settings); + + // Any special ini settings + // these may overwrite the test defaults... + if (array_key_exists('INI', $section_text)) { + if (strpos($section_text['INI'], '{PWD}') !== false) { + $section_text['INI'] = str_replace('{PWD}', dirname($file), $section_text['INI']); + } + settings2array(preg_split( "/[\n\r]+/", $section_text['INI']), $ini_settings); + } + settings2params($ini_settings); + // Check if test should be skipped. $info = ''; $warn = false; if (array_key_exists('SKIPIF', $section_text)) { if (trim($section_text['SKIPIF'])) { - $skipif_params = array(); - settings2array($ini_overwrites,$skipif_params); - settings2params($skipif_params); - if ($cfg['show']['skip']) { echo "\n========SKIP========\n"; echo $section_text['SKIPIF']; @@ -1121,7 +1138,7 @@ save_text($test_skipif, $section_text['SKIPIF'], $temp_skipif); $extra = substr(PHP_OS, 0, 3) !== "WIN" ? "unset REQUEST_METHOD; unset QUERY_STRING; unset PATH_TRANSLATED; unset SCRIPT_FILENAME; unset REQUEST_METHOD;": ""; - $output = system_with_timeout("$extra $php -q $skipif_params $test_skipif", $env); + $output = system_with_timeout("$extra $php -q $ini_settings $test_skipif", $env); if (!$cfg['keep']['skip']) { @unlink($test_skipif); } @@ -1207,23 +1224,6 @@ return 'BORKED'; } - - // Default ini settings - $ini_settings = array(); - // additional ini overwrites - //$ini_overwrites[] = 'setting=value'; - settings2array($ini_overwrites, $ini_settings); - - // Any special ini settings - // these may overwrite the test defaults... - if (array_key_exists('INI', $section_text)) { - if (strpos($section_text['INI'], '{PWD}') !== false) { - $section_text['INI'] = str_replace('{PWD}', dirname($file), $section_text['INI']); - } - settings2array(preg_split( "/[\n\r]+/", $section_text['INI']), $ini_settings); - } - settings2params($ini_settings); - // We've satisfied the preconditions - run the test! if ($cfg['show']['php']) { echo "\n========TEST========\n";