zoe Sat Dec 6 12:00:38 2008 UTC
Modified files: (Branch: PHP_5_3)
/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.35.2.52&r2=1.226.2.37.2.35.2.53&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.35.2.52
php-src/run-tests.php:1.226.2.37.2.35.2.53
--- php-src/run-tests.php:1.226.2.37.2.35.2.52 Thu Nov 6 03:09:41 2008
+++ php-src/run-tests.php Sat Dec 6 12:00:37 2008
@@ -24,7 +24,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.35.2.52 2008/11/06 03:09:41 scottmac Exp
$ */
+/* $Id: run-tests.php,v 1.226.2.37.2.35.2.53 2008/12/06 12:00:37 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
@@ -612,7 +612,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.35.2.52
$' . "\n";
+ echo '$Revision: 1.226.2.37.2.35.2.53
$' . "\n";
exit(1);
default:
@@ -1730,6 +1730,11 @@
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',
$wanted_re
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
