summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-11-29 01:36:38 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:46:42 +0100
commit902b1935bb5655dc9340747ddf8a0e70de231882 (patch)
treea6703befe77a0afc95b2d609c3463030b5cf1dee
parente22c7f1fe35047ba3b0434c683ee8e9d6898b35d (diff)
downloadsamba-902b1935bb5655dc9340747ddf8a0e70de231882.tar.gz
samba-902b1935bb5655dc9340747ddf8a0e70de231882.tar.bz2
samba-902b1935bb5655dc9340747ddf8a0e70de231882.zip
r26190: Allow successful as well as success.
(This used to be commit d5dd11d1f5837c1aa929e8168d5d51a470277b88)
-rw-r--r--source4/selftest/Subunit.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/selftest/Subunit.pm b/source4/selftest/Subunit.pm
index 2ecafb42d0..27e1b9815f 100644
--- a/source4/selftest/Subunit.pm
+++ b/source4/selftest/Subunit.pm
@@ -20,7 +20,7 @@ sub parse_results($$$$$)
$msg_ops->control_msg($msg_state, $_);
$open_tests->{$1} = 1;
$msg_ops->start_test($msg_state, $1);
- } elsif (/^(success|failure|skip|error): (.*?)( \[)?([ \t]*)\n/) {
+ } elsif (/^(success|successful|failure|skip|error): (.*?)( \[)?([ \t]*)\n/) {
$msg_ops->control_msg($msg_state, $_);
my $reason = undef;
if ($3) {
@@ -32,7 +32,7 @@ sub parse_results($$$$$)
}
}
my $result = $1;
- if ($1 eq "success") {
+ if ($1 eq "success" or $1 eq "successful") {
delete $open_tests->{$2};
if ($expecting_failure->("$msg_state->{NAME}/$2")) {
$statistics->{TESTS_UNEXPECTED_OK}++;