summaryrefslogtreecommitdiff
path: root/selftest
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-09-14 00:09:46 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-09-14 10:54:28 +0200
commitc0923cfac1a15efddaadfb851d0eab93eba31ef3 (patch)
tree204cf5d67c89041da832e6b6402ffb1f3329d39f /selftest
parent7d4968e161d5868b65dd5d8ef5bb0e391109c0b5 (diff)
downloadsamba-c0923cfac1a15efddaadfb851d0eab93eba31ef3.tar.gz
subunit.pm: Remove output_msg/control_msg functions.
Diffstat (limited to 'selftest')
-rw-r--r--selftest/Subunit.pm5
-rw-r--r--selftest/Subunit/Filter.pm11
2 files changed, 1 insertions, 15 deletions
diff --git a/selftest/Subunit.pm b/selftest/Subunit.pm
index 6d50fb39888..429f770558f 100644
--- a/selftest/Subunit.pm
+++ b/selftest/Subunit.pm
@@ -31,11 +31,9 @@ sub parse_results($$)
while(<$fh>) {
if (/^test: (.+)\n/) {
- $msg_ops->control_msg($_);
$msg_ops->start_test($1);
push (@$open_tests, $1);
} elsif (/^(success|successful|failure|fail|skip|knownfail|error|xfail): (.*?)( \[)?([ \t]*)( multipart)?\n/) {
- $msg_ops->control_msg($_);
my $result = $1;
my $testname = $2;
my $reason = undef;
@@ -44,7 +42,6 @@ sub parse_results($$)
# reason may be specified in next lines
my $terminated = 0;
while(<$fh>) {
- $msg_ops->control_msg($_);
if ($_ eq "]\n") { $terminated = 1; last; } else { $reason .= $_; }
}
@@ -76,7 +73,7 @@ sub parse_results($$)
$msg_ops->end_test($testname, "error", $reason);
}
} else {
- $msg_ops->output_msg($_);
+ print $_;
}
}
diff --git a/selftest/Subunit/Filter.pm b/selftest/Subunit/Filter.pm
index 5ac304f1ee1..e2b9d1c9ad6 100644
--- a/selftest/Subunit/Filter.pm
+++ b/selftest/Subunit/Filter.pm
@@ -7,17 +7,6 @@ package Subunit::Filter;
use strict;
-sub control_msg()
-{
- # We regenerate control messages, so ignore this
-}
-
-sub output_msg($$)
-{
- my ($self, $msg) = @_;
- print $msg;
-}
-
sub start_test($$)
{
my ($self, $testname) = @_;