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

dmitry Tue Dec 25 12:06:23 2007 UTC Modified files: (Branch: PHP_5_2) /php-src run-tests.php Log: Fixed %f regex http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.39&r2=1.226.2.37.2.40&diff_format=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.226.2.37.2.39 php-src/run-tests.php:1.226.2.37.2.40 --- php-src/run-tests.php:1.226.2.37.2.39 Mon Dec 24 04:24:20 2007 +++ php-src/run-tests.php Tue Dec 25 12:06:22 2007 @@ -24,7 +24,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: run-tests.php,v 1.226.2.37.2.39 2007/12/24 04:24:20 kraghuba Exp $ */ +/* $Id: run-tests.php,v 1.226.2.37.2.40 2007/12/25 12:06:22 dmitry 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 @@ -403,7 +403,7 @@ $html_output = is_resource($html_file); break; case '--version': - echo '$Revision: 1.226.2.37.2.39 $'."\n"; + echo '$Revision: 1.226.2.37.2.40 $'."\n"; exit(1); case 'u': @@ -1517,7 +1517,7 @@ $wanted_re = str_replace('%i', '[+-]?\d+', $wanted_re); $wanted_re = str_replace('%d', '\d+', $wanted_re); $wanted_re = str_replace('%x', '[0-9a-fA-F]+', $wanted_re); - $wanted_re = str_replace('%f', '[+-]?\.?\d+\.?\d*(?:E|e[+-]?\d+)?', $wanted_re); + $wanted_re = str_replace('%f', '[+-]?\.?\d+\.?\d*(?:[Ee][+-]?\d+)?', $wanted_re); $wanted_re = str_replace('%c', '.', $wanted_re); // %f allows two points "-.0.0" but that is the best *simple* expression }