diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-06-03 18:08:54 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-06-11 19:59:58 +0200 |
| commit | 0e2f97092cc3aa216151c2dc0054e9f982b9bbf8 (patch) | |
| tree | 686e4da07b3a964b13cd70304c3e4d271759e1cb /selftest | |
| parent | 9e108009d0d4ec97a4b9cf989e3cb2cbc74f4ded (diff) | |
| download | samba-0e2f97092cc3aa216151c2dc0054e9f982b9bbf8.tar.gz samba-0e2f97092cc3aa216151c2dc0054e9f982b9bbf8.tar.xz samba-0e2f97092cc3aa216151c2dc0054e9f982b9bbf8.zip | |
Subunit: Support "fail" as alias for "failure" in Subunit streams.
Diffstat (limited to 'selftest')
| -rw-r--r-- | selftest/Subunit.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/selftest/Subunit.pm b/selftest/Subunit.pm index 0bbb795c8c2..f7284d3f55a 100644 --- a/selftest/Subunit.pm +++ b/selftest/Subunit.pm @@ -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|skip|knownfail|error): (.*?)( \[)?([ \t]*)\n/) { + } elsif (/^(success|successful|failure|fail|skip|knownfail|error): (.*?)( \[)?([ \t]*)\n/) { $msg_ops->control_msg($_); my $reason = undef; if ($3) { @@ -68,7 +68,7 @@ sub parse_results($$$$$) $statistics->{TESTS_EXPECTED_OK}++; $msg_ops->end_test($open_tests, $2, $1, 0, $reason); } - } elsif ($1 eq "failure") { + } 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}++; |