cvs: php-src / run-tests.php
| From: | Arnaud Le Blanc | Date: | Mon, 08 Sep 2008 09:23:24 +0000 |
| Subject: | cvs: php-src / run-tests.php | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-52985@lists.php.net to get a copy of this message | ||
lbarnaud Mon Sep 8 09:23:24 2008 UTC
Modified files:
/php-src run-tests.php
Log:
run-tests.php: Added %u|b% placeholder, like %unicode|string%, for array
keys in var_dump() output.
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.376&r2=1.377&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.376 php-src/run-tests.php:1.377
--- php-src/run-tests.php:1.376 Sat Aug 30 11:24:56 2008
+++ php-src/run-tests.php Mon Sep 8 09:23:24 2008
@@ -24,7 +24,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: run-tests.php,v 1.376 2008/08/30 11:24:56 helly Exp $ */
+/* $Id: run-tests.php,v 1.377 2008/09/08 09:23:24 lbarnaud 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
@@ -609,7 +609,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.376 $' . "\n";
+ echo '$Revision: 1.377 $' . "\n";
exit(1);
default:
@@ -1741,6 +1741,11 @@
version_compare(PHP_VERSION, '6.0.0-dev') == -1 ? 'string' :
'unicode',
$wanted_re
);
+ $wanted_re = str_replace(
+ array('%u\|b%', '%b\|u%'),
+ version_compare(PHP_VERSION, '6.0.0-dev') == -1 ? '' : 'u',
+ $wanted_re
+ );
// Stick to basics
$wanted_re = str_replace('%e', '\\' . DIRECTORY_SEPARATOR, $wanted_re);
$wanted_re = str_replace('%s', '[^\r\n]+', $wanted_re);