subunit.pm: Remove output_msg/control_msg functions.

diff --git a/selftest/Subunit.pm b/selftest/Subunit.pm
index 6d50fb398880f9a9084639941fa77d7295469bd4..429f770558f20d047fa968375da7cb32cd09f14b 100644 (file)
--- 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 5ac304f1ee1777d3427a1a7eb016ec0ca8525a43..e2b9d1c9ad628358c76cbbaf7949189cef424905 100644 (file)
--- 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) = @_;