From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 3 Jun 2009 16:08:54 +0000 (+0200)
Subject: Subunit: Support "fail" as alias for "failure" in Subunit streams.
X-Git-Tag: tdb-1.1.5~88
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e2f97092cc3aa216151c2dc0054e9f982b9bbf8;p=thirdparty%2Fsamba.git

Subunit: Support "fail" as alias for "failure" in Subunit streams.
---

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}++;