diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-06-03 18:19:01 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-06-11 19:59:58 +0200 |
| commit | 24f01e70aaefb390d081bcd8cec6cd42282430b4 (patch) | |
| tree | 66280c4c8b9f059b8ae612efe2537db23cd8a783 /selftest/Subunit.pm | |
| parent | 4e276fb60a61f559e1d343261fc15c794c921dd7 (diff) | |
| download | samba-24f01e70aaefb390d081bcd8cec6cd42282430b4.tar.gz samba-24f01e70aaefb390d081bcd8cec6cd42282430b4.tar.bz2 samba-24f01e70aaefb390d081bcd8cec6cd42282430b4.zip | |
selftest: Use filter-xfail for known failures
Diffstat (limited to 'selftest/Subunit.pm')
| -rw-r--r-- | selftest/Subunit.pm | 35 |
1 files changed, 12 insertions, 23 deletions
diff --git a/selftest/Subunit.pm b/selftest/Subunit.pm index f7284d3f55..0eafc44146 100644 --- a/selftest/Subunit.pm +++ b/selftest/Subunit.pm @@ -23,9 +23,9 @@ require Exporter; use strict; -sub parse_results($$$$$) +sub parse_results($$$$) { - my ($msg_ops, $statistics, $fh, $expecting_failure, $open_tests) = @_; + my ($msg_ops, $statistics, $fh, $open_tests) = @_; my $unexpected_ok = 0; my $expected_fail = 0; my $unexpected_fail = 0; @@ -39,7 +39,7 @@ sub parse_results($$$$$) push (@$open_tests, $1); } elsif (/^time: (\d+)-(\d+)-(\d+) (\d+):(\d+):(\d+)Z\n/) { $msg_ops->report_time(mktime($6, $5, $4, $3, $2, $1)); - } elsif (/^(success|successful|failure|fail|skip|knownfail|error): (.*?)( \[)?([ \t]*)\n/) { + } elsif (/^(success|successful|failure|fail|skip|knownfail|error|xfail): (.*?)( \[)?([ \t]*)\n/) { $msg_ops->control_msg($_); my $reason = undef; if ($3) { @@ -60,29 +60,18 @@ sub parse_results($$$$$) my $result = $1; if ($1 eq "success" or $1 eq "successful") { pop(@$open_tests); #FIXME: Check that popped value == $2 - if ($expecting_failure->(join(".", @$open_tests) . ".$2")) { - $statistics->{TESTS_UNEXPECTED_OK}++; - $msg_ops->end_test($open_tests, $2, $1, 1, $reason); - $unexpected_ok++; - } else { - $statistics->{TESTS_EXPECTED_OK}++; - $msg_ops->end_test($open_tests, $2, $1, 0, $reason); - } - } elsif ($1 eq "failure" or $1 eq "fail") { - pop(@$open_tests); #FIXME: Check that popped value == $2 - if ($expecting_failure->(join(".", @$open_tests) . ".$2")) { - $statistics->{TESTS_EXPECTED_FAIL}++; - $msg_ops->end_test($open_tests, $2, $1, 0, $reason); - $expected_fail++; - } else { - $statistics->{TESTS_UNEXPECTED_FAIL}++; - $msg_ops->end_test($open_tests, $2, $1, 1, $reason); - $unexpected_fail++; - } - } elsif ($1 eq "knownfail") { + $statistics->{TESTS_EXPECTED_OK}++; + $msg_ops->end_test($open_tests, $2, $1, 0, $reason); + } elsif ($1 eq "xfail" or $1 eq "knownfail") { pop(@$open_tests); #FIXME: Check that popped value == $2 $statistics->{TESTS_EXPECTED_FAIL}++; $msg_ops->end_test($open_tests, $2, $1, 0, $reason); + $expected_fail++; + } elsif ($1 eq "failure" or $1 eq "fail") { + pop(@$open_tests); #FIXME: Check that popped value == $2 + $statistics->{TESTS_UNEXPECTED_FAIL}++; + $msg_ops->end_test($open_tests, $2, $1, 1, $reason); + $unexpected_fail++; } elsif ($1 eq "skip") { $statistics->{TESTS_SKIP}++; pop(@$open_tests); #FIXME: Check that popped value == $2 |