bjori Wed, 31 Aug 2011 10:09:54 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=315871
Log:
Remove annoying extra newline on XFAIL summaries
and sync text to trunk
Changed paths:
U php/php-src/branches/PHP_5_3/run-tests.php
U php/php-src/branches/PHP_5_4/run-tests.php
U php/php-src/trunk/run-tests.php
Modified: php/php-src/branches/PHP_5_3/run-tests.php
===================================================================
--- php/php-src/branches/PHP_5_3/run-tests.php 2011-08-31 10:08:55 UTC (rev
315870)
+++ php/php-src/branches/PHP_5_3/run-tests.php 2011-08-31 10:09:54 UTC (rev
315871)
@@ -1948,7 +1948,7 @@
if (!$passed) {
if (isset($section_text['XFAIL'])) {
$restype[] = 'XFAIL';
- $info = ' XFAIL REASON: ' . $section_text['XFAIL'];
+ $info = ' XFAIL REASON: ' .
rtrim($section_text['XFAIL']);
} else {
$restype[] = 'FAIL';
}
Modified: php/php-src/branches/PHP_5_4/run-tests.php
===================================================================
--- php/php-src/branches/PHP_5_4/run-tests.php 2011-08-31 10:08:55 UTC (rev
315870)
+++ php/php-src/branches/PHP_5_4/run-tests.php 2011-08-31 10:09:54 UTC (rev
315871)
@@ -1948,7 +1948,7 @@
if (!$passed) {
if (isset($section_text['XFAIL'])) {
$restype[] = 'XFAIL';
- $info = ' XFAIL REASON: ' . $section_text['XFAIL'];
+ $info = ' XFAIL REASON: ' .
rtrim($section_text['XFAIL']);
} else {
$restype[] = 'FAIL';
}
Modified: php/php-src/trunk/run-tests.php
===================================================================
--- php/php-src/trunk/run-tests.php 2011-08-31 10:08:55 UTC (rev 315870)
+++ php/php-src/trunk/run-tests.php 2011-08-31 10:09:54 UTC (rev 315871)
@@ -326,12 +326,10 @@
echo "\nYou may have found a problem in PHP.";
}
echo "\nThis report can be automatically sent to the PHP QA
team at\n";
- echo QA_REPORTS_PAGE . "\n";
- echo "Reports for current versions of PHP will also appear
on\n";
- echo "http://news.php.net/php.qa.reports\n";;
+ echo QA_REPORTS_PAGE . " and
http://news.php.net/php.qa.reports\n";;
echo "This gives us a better understanding of PHP's
behavior.\n";
echo "If you don't want to send the report immediately you can
choose\n";
- echo "option \"s\" to save it. You can then email this report
to ". PHP_QA_EMAIL . " later.\n";
+ echo "option \"s\" to save it. You can then email it to ".
PHP_QA_EMAIL . " later.\n";
echo "Do you want to send this report now? [Yns]: ";
flush();
@@ -1950,7 +1948,7 @@
if (!$passed) {
if (isset($section_text['XFAIL'])) {
$restype[] = 'XFAIL';
- $info = ' XFAIL REASON: ' . $section_text['XFAIL'];
+ $info = ' XFAIL REASON: ' .
rtrim($section_text['XFAIL']);
} else {
$restype[] = 'FAIL';
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
