lstrojny Wed Jul 23 16:10:14 2008 UTC Modified files: /php-src run-tests.php Log: Allowing "%unicode|string%" as a placeholder. In 6, this placeholder is resolved to "unicode", in <6 to "string". This allows to easily write portable tests. Patch by uw http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.366&r2=1.367&diff_format=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.366 php-src/run-tests.php:1.367 --- php-src/run-tests.php:1.366 Tue Jul 22 19:53:00 2008 +++ php-src/run-tests.php Wed Jul 23 16:10:14 2008 @@ -24,7 +24,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: run-tests.php,v 1.366 2008/07/22 19:53:00 felipe Exp $ */ +/* $Id: run-tests.php,v 1.367 2008/07/23 16:10:14 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.366 $' . "\n"; + echo '$Revision: 1.367 $' . "\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);
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php