cvs: php-src / run-tests.php

dmitry Tue Dec 25 12:06:53 2007 UTC Modified files: /php-src run-tests.php Log: Fixed %f regex http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.335&r2=1.336&diff_format=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.335 php-src/run-tests.php:1.336 --- php-src/run-tests.php:1.335 Mon Dec 24 04:20:15 2007 +++ php-src/run-tests.php Tue Dec 25 12:06:53 2007 @@ -24,7 +24,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: run-tests.php,v 1.335 2007/12/24 04:20:15 kraghuba Exp $ */ +/* $Id: run-tests.php,v 1.336 2007/12/25 12:06:53 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 @@ -415,7 +415,7 @@ $html_output = is_resource($html_file); break; case '--version': - echo '$Revision: 1.335 $'."\n"; + echo '$Revision: 1.336 $'."\n"; exit(1); default: echo "Illegal switch specified!\n"; @@ -1600,7 +1600,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 }