diff options
| -rw-r--r-- | selftest/Subunit/Filter.pm | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/selftest/Subunit/Filter.pm b/selftest/Subunit/Filter.pm index 2b390d189a8..93b690df8ee 100644 --- a/selftest/Subunit/Filter.pm +++ b/selftest/Subunit/Filter.pm @@ -76,12 +76,6 @@ sub start_test($$) Subunit::start_test($testname); } -sub is_failure($) -{ - my ($result) = @_; - return $result eq "fail" or $result eq "failure" or $result eq "error"; -} - sub end_test($$$$$) { my ($self, $testname, $result, $unexpected, $reason) = @_; @@ -90,12 +84,12 @@ sub end_test($$$$$) $testname = $self->{prefix}.$testname; } - if (is_failure($result) and not $unexpected) { + if (($result eq "fail" or $result eq "failure") and not $unexpected) { $result = "xfail"; $self->{xfail_added}++; } my $xfail_reason = find_in_list($self->{expected_failures}, $testname); - if (defined($xfail_reason) and is_failure($result)) { + if (defined($xfail_reason) and ($result eq "fail" or $result eq "failure")) { $result = "xfail"; $self->{xfail_added}++; $reason .= $xfail_reason; @@ -127,7 +121,7 @@ sub start_testsuite($;$) sub end_testsuite($$;$) { my ($self, $name, $result, $reason) = @_; - if ($self->{xfail_added} and is_failure($result)) { + if ($self->{xfail_added} and ($result eq "fail" or $result eq "failure")) { $result = "xfail"; } |