com php-src: Don't treat warnings as failures in the junit output: run-tests.php
| From: | Matteo Beccati | Date: | Wed, 29 Oct 2014 13:34:48 +0000 |
| Subject: | com php-src: Don't treat warnings as failures in the junit output: run-tests.php | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-82846@lists.php.net to get a copy of this message | ||
Commit: abfb30dc67dfbfb3d3abaa502faa29ef9d82c459
Author: Matteo Beccati <mbeccati@php.net> Wed, 29 Oct 2014 14:32:41 +0100
Parents: 3e9138e6b5fc48034b669ddb0270368e562b7957
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=abfb30dc67dfbfb3d3abaa502faa29ef9d82c459
Log:
Don't treat warnings as failures in the junit output
This matches Travis and the actual return code.
Changed paths:
M run-tests.php
Diff:
diff --git a/run-tests.php b/run-tests.php
index 4f29345..17930b2 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -2724,7 +2724,7 @@ function junit_mark_test_as($type, $file_name, $test_name, $time = null,
$messag
if (is_array($type)) {
$output_type = $type[0] . 'ED';
- $temp = array_intersect(array('XFAIL', 'FAIL'), $type);
+ $temp = array_intersect(array('XFAIL', 'FAIL', 'WARN'), $type);
$type = reset($temp);
} else {
$output_type = $type . 'ED';
@@ -2738,6 +2738,9 @@ function junit_mark_test_as($type, $file_name, $test_name, $time = null,
$messag
} elseif ('SKIP' == $type) {
junit_suite_record($suite, 'test_skip');
$JUNIT['files'][$file_name]['xml'] .=
"<skipped>$escaped_message</skipped>\n";
+ } elseif ('WARN' == $type) {
+ junit_suite_record($suite, 'test_warn');
+ $JUNIT['files'][$file_name]['xml'] .=
"<warning>$escaped_message</warning>\n";
} elseif('FAIL' == $type) {
junit_suite_record($suite, 'test_fail');
$JUNIT['files'][$file_name]['xml'] .= "<failure
type='$output_type'
message='$escaped_message'>$escaped_details</failure>\n";