cvs: php-src(PHP_5_3) / run-tests.php
| From: | Lars Strojny | Date: | Wed, 23 Jul 2008 16:11:00 +0000 |
| Subject: | cvs: php-src(PHP_5_3) / run-tests.php | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-51464@lists.php.net to get a copy of this message | ||
lstrojny Wed Jul 23 16:11:00 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src run-tests.php
Log:
Allowing "%unicode|string%" as a placeholder (backport from HEAD)
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.35.2.37&r2=1.226.2.37.2.35.2.38&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.37 php-src/run-tests.php:1.226.2.37.2.35.2.38
--- php-src/run-tests.php:1.226.2.37.2.35.2.37 Tue Jul 22 19:59:37 2008
+++ php-src/run-tests.php Wed Jul 23 16:11:00 2008
@@ -24,7 +24,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.37 2008/07/22 19:59:37 felipe Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.38 2008/07/23 16:11:00 lstrojny 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
@@ -478,7 +478,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.37 $' . "\n";
+ echo '$Revision: 1.226.2.37.2.35.2.38 $' . "\n";
exit(1);
default:
@@ -1711,6 +1711,11 @@
if (isset($section_text['EXPECTF'])) {
$wanted_re = preg_quote($wanted_re, '/');
+ $wanted_re = str_replace(
+ array('%unicode\|string%', '%string\|unicode%'),
+ version_compare(PHP_VERSION, '6.0.0-dev') == -1 ? 'string' :
'unicode',
+ $wanted_re
+ );
// Stick to basics
$wanted_re = str_replace('%e', '\\' . DIRECTORY_SEPARATOR, $wanted_re);
$wanted_re = str_replace('%s', '[^\r\n]+', $wanted_re);