zoe Sat Dec 6 12:02:24 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src run-tests.php
Log:
More changes to allow the same tests to be used with PHP5 and PHP6
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.51&r2=1.226.2.37.2.52&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.51
php-src/run-tests.php:1.226.2.37.2.52
--- php-src/run-tests.php:1.226.2.37.2.51 Wed Dec 3 14:27:43 2008
+++ php-src/run-tests.php Sat Dec 6 12:02:24 2008
@@ -24,7 +24,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.51 2008/12/03 14:27:43 robinf Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.52 2008/12/06 12:02:24 zoe 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
@@ -608,7 +608,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.51 $' .
"\n";
+ echo '$Revision: 1.226.2.37.2.52 $' .
"\n";
exit(1);
default:
@@ -1725,6 +1725,12 @@
if (isset($section_text['EXPECTF'])) {
$wanted_re = preg_quote($wanted_re, '/');
+ $wanted_re = str_replace(
+ array('%binary_string_optional%'),
+ version_compare(PHP_VERSION, '6.0.0-dev') ==
-1 ? 'string' : 'binary string',
+ $wanted_re
+ );
+
$wanted_re = str_replace(
array('%unicode_string_optional%'),
version_compare(PHP_VERSION, '6.0.0-dev') == -1
? 'string' : 'Unicode string',
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
