johannes Sun Oct 19 18:05:43 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src run-tests.php
Log:
Add %S and %A to EXPECTF, they work like %s and %a but match empty strings,
too
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.48&r2=1.226.2.37.2.35.2.49&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.48
php-src/run-tests.php:1.226.2.37.2.35.2.49
--- php-src/run-tests.php:1.226.2.37.2.35.2.48 Tue Sep 30 13:21:48 2008
+++ php-src/run-tests.php Sun Oct 19 18:05:43 2008
@@ -24,7 +24,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.48 2008/09/30 13:21:48 rrichards Exp
$ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.49 2008/10/19 18:05:43 johannes 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
@@ -612,7 +612,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.48
$' . "\n";
+ echo '$Revision: 1.226.2.37.2.35.2.49
$' . "\n";
exit(1);
default:
@@ -1747,7 +1747,9 @@
// Stick to basics
$wanted_re = str_replace('%e', '\\' .
DIRECTORY_SEPARATOR, $wanted_re);
$wanted_re = str_replace('%s', '[^\r\n]+', $wanted_re);
+ $wanted_re = str_replace('%S', '[^\r\n]*', $wanted_re);
$wanted_re = str_replace('%a', '.+', $wanted_re);
+ $wanted_re = str_replace('%A', '.*', $wanted_re);
$wanted_re = str_replace('%w', '\s*', $wanted_re);
$wanted_re = str_replace('%i', '[+-]?\d+', $wanted_re);
$wanted_re = str_replace('%d', '\d+', $wanted_re);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
