bjori Thu Apr 16 13:43:28 2009 UTC
Modified files: (Branch: PHP_5_2)
/php-src run-tests.php
Log:
MFH: sync WS
http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.60&r2=1.226.2.37.2.61&diff_format=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.37.2.60
php-src/run-tests.php:1.226.2.37.2.61
--- php-src/run-tests.php:1.226.2.37.2.60 Thu Apr 16 13:41:50 2009
+++ php-src/run-tests.php Thu Apr 16 13:43:28 2009
@@ -24,7 +24,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: run-tests.php,v 1.226.2.37.2.60 2009/04/16 13:41:50 bjori Exp $ */
+/* $Id: run-tests.php,v 1.226.2.37.2.61 2009/04/16 13:43:28 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
@@ -632,7 +632,7 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo '$Revision: 1.226.2.37.2.60 $' .
"\n";
+ echo '$Revision: 1.226.2.37.2.61 $' .
"\n";
exit(1);
default:
@@ -1753,7 +1753,7 @@
$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";
@@ -1773,7 +1773,7 @@
$start = $end = $length;
}
// quote a non re portion of the string
- $temp = $temp . preg_quote(substr($wanted_re,
$startOffset, ($start - $startOffset)), '/');
+ $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;
@@ -1828,14 +1828,14 @@
$php = $old_php;
}
- if (!$leaked && !$failed_headers) {
- if (isset($section_text['XFAIL'] )) {
- $warn = true;
- $info = " (warn: XFAIL section but test
passes)";
- }else {
- show_result("PASS", $tested, $tested_file, '',
$temp_filenames);
- return 'PASSED';
- }
+ if (!$leaked && !$failed_headers) {
+ if (isset($section_text['XFAIL'] )) {
+ $warn = true;
+ $info = " (warn: XFAIL section but test
passes)";
+ }else {
+ show_result("PASS", $tested,
$tested_file, '', $temp_filenames);
+ return 'PASSED';
+ }
}
}
@@ -1857,14 +1857,14 @@
$php = $old_php;
}
- if (!$leaked && !$failed_headers) {
- if (isset($section_text['XFAIL'] )) {
- $warn = true;
- $info = " (warn: XFAIL section but test
passes)";
- }else {
- show_result("PASS", $tested, $tested_file, '',
$temp_filenames);
- return 'PASSED';
- }
+ if (!$leaked && !$failed_headers) {
+ if (isset($section_text['XFAIL'] )) {
+ $warn = true;
+ $info = " (warn: XFAIL section but test
passes)";
+ }else {
+ show_result("PASS", $tested,
$tested_file, '', $temp_filenames);
+ return 'PASSED';
+ }
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
