mirror of
https://github.com/php/php-src.git
synced 2024-09-21 18:07:23 +00:00
Don't treat warnings as failures in the junit output
This matches Travis and the actual return code.
This commit is contained in:
parent
daf9357d27
commit
a3b4f8320d
@ -2714,7 +2714,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';
|
||||
@ -2728,6 +2728,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";
|
||||
|
Loading…
Reference in New Issue
Block a user