cvs: php-src / run-tests.php

rrichards Sat Jul 22 13:12:20 2006 UTC Modified files: /php-src run-tests.php Log: force unicode off in native mode (-N switch) swap usage of single and double quotes for win32 compat http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.297&r2=1.298&diff_format=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.297 php-src/run-tests.php:1.298 --- php-src/run-tests.php:1.297 Mon Jul 17 11:46:12 2006 +++ php-src/run-tests.php Sat Jul 22 13:12:19 2006 @@ -23,7 +23,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: run-tests.php,v 1.297 2006/07/17 11:46:12 nlopess Exp $ */ +/* $Id: run-tests.php,v 1.298 2006/07/22 13:12:19 rrichards 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 @@ -179,9 +179,9 @@ settings2params($info_params); $php_info = $php $pass_options $info_params $info_file; @unlink($info_file); - define('TESTED_PHP_VERSION', $php -r 'echo PHP_VERSION;'); + define('TESTED_PHP_VERSION', $php -r "echo PHP_VERSION;"); - $unicode = $php $pass_options $info_params -r 'echo ini_get("unicode.semantics");'; + $unicode = $php $pass_options $info_params -r "echo ini_get('unicode.semantics');"; define('TESTED_UNICODE', strcasecmp($unicode,"on") == 0 || $unicode == 1); // load list of enabled extensions @@ -333,6 +333,7 @@ case 'N': $unicode_and_native = false; $unicode_testing = false; + $ini_overwrites[] = 'unicode.semantics=0'; break; case '--no-clean': $no_clean = true; @@ -399,7 +400,7 @@ $html_output = is_resource($html_file); break; case '--version': - echo '$Revision: 1.297 $'."\n"; + echo '$Revision: 1.298 $'."\n"; exit(1); default: echo "Illegal switch specified!\n";