summaryrefslogtreecommitdiff
path: root/run-tests.php
diff options
context:
space:
mode:
authorMatteo Beccati <mbeccati@php.net>2014-10-29 14:32:41 +0100
committerMatteo Beccati <mbeccati@php.net>2014-10-29 14:34:58 +0100
commit8bd58502ca39d65df45c0020a4d5165072397199 (patch)
tree8ca26ab673d5e9d3c174e6451275f93e2b21bde5 /run-tests.php
parent68b5dd2ba9fa6d8b261d779ce1855221ad241145 (diff)
downloadphp-git-8bd58502ca39d65df45c0020a4d5165072397199.tar.gz
Don't treat warnings as failures in the junit output
This matches Travis and the actual return code.
Diffstat (limited to 'run-tests.php')
-rwxr-xr-xrun-tests.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/run-tests.php b/run-tests.php
index 1b5bcec253..315ae09200 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -2718,7 +2718,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';
@@ -2732,6 +2732,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";