bjori Thu Apr 16 13:39:31 2009 UTC
Modified files:
/php-src run-tests.php
Log:
Sync WS with 5.3
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.393&r2=1.394&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.393 php-src/run-tests.php:1.394
--- php-src/run-tests.php:1.393 Thu Mar 12 20:39:02 2009
+++ php-src/run-tests.php Thu Apr 16 13:39:31 2009
@@ -2,7 +2,7 @@
<?php
/*
+----------------------------------------------------------------------+
- | PHP Version 6, 6 |
+ | PHP Version 5, 6 |
+----------------------------------------------------------------------+
| Copyright (c) 1997-2009 The PHP Group |
+----------------------------------------------------------------------+
@@ -24,7 +24,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: run-tests.php,v 1.393 2009/03/12 20:39:02 zoe Exp $ */
+/* $Id: run-tests.php,v 1.394 2009/04/16 13:39:31 bjori 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
@@ -617,7 +617,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.393 $' . "\n";
+ echo '$Revision: 1.394 $' . "\n";
exit(1);
default:
@@ -1737,34 +1737,34 @@
$wanted_re = preg_replace('/\r\n/', "\n", $wanted);
if (isset($section_text['EXPECTF'])) {
-
- // do preg_quote, but miss out any %r delimited sections
- $temp = "";
- $r = "%r";
- $startOffset = 0;
- $length = strlen($wanted_re);
- while($startOffset < $length) {
- $start = strpos($wanted_re, $r, $startOffset);
- if ($start !== false) {
- // we have found a start tag
- $end = strpos($wanted_re, $r, $start+2);
- if ($end === false) {
- // unbalanced tag, ignore it.
- $end = $start = $length;
+
+ // do preg_quote, but miss out any %r delimited sections
+ $temp = "";
+ $r = "%r";
+ $startOffset = 0;
+ $length = strlen($wanted_re);
+ while($startOffset < $length) {
+ $start = strpos($wanted_re, $r, $startOffset);
+ if ($start !== false) {
+ // we have found a start tag
+ $end = strpos($wanted_re, $r, $start+2);
+ if ($end === false) {
+ // unbalanced tag, ignore it.
+ $end = $start = $length;
+ }
+ } else {
+ // no more %r sections
+ $start = $end = $length;
}
- } else {
- // no more %r sections
- $start = $end = $length;
+ // quote a non re portion of the string
+ $temp = $temp . preg_quote(substr($wanted_re,
$startOffset, ($start - $startOffset)), '/');
+ // add the re unquoted.
+ $temp = $temp . '(' . substr($wanted_re,
$start+2, ($end - $start-2)). ')';
+ $startOffset = $end + 2;
}
- // quote a non re portion of the string
- $temp = $temp . preg_quote(substr($wanted_re,
$startOffset, ($start - $startOffset)), '/');
- // add the re unquoted.
- $temp = $temp . '(' . substr($wanted_re, $start+2,
($end - $start-2)). ')';
- $startOffset = $end + 2;
- }
- $wanted_re = $temp;
+ $wanted_re = $temp;
- $wanted_re = str_replace(
+ $wanted_re = str_replace(
array('%binary_string_optional%'),
version_compare(PHP_VERSION, '6.0.0-dev') == -1
? 'string' : 'binary string',
$wanted_re
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
