From 994a4d35fc21e2b74ed7db0d5591c530658c088d Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 12 Jun 2009 00:53:27 +0200 Subject: format-subunit: Remove subunit output module. We can still use "cat" to obtain a subunit stream from a subunit stream. :-) --- selftest/format-subunit.pl | 3 -- selftest/output/subunit.pm | 101 --------------------------------------------- 2 files changed, 104 deletions(-) delete mode 100644 selftest/output/subunit.pm (limited to 'selftest') diff --git a/selftest/format-subunit.pl b/selftest/format-subunit.pl index 77e4b34f38..629d02a055 100755 --- a/selftest/format-subunit.pl +++ b/selftest/format-subunit.pl @@ -85,9 +85,6 @@ if ($opt_format eq "buildfarm") { require output::html; mkdir("test-results", 0777); $msg_ops = new output::html("test-results", $statistics); -} elsif ($opt_format eq "subunit") { - require output::subunit; - $msg_ops = new output::subunit(); } else { die("Invalid output format '$opt_format'"); } diff --git a/selftest/output/subunit.pm b/selftest/output/subunit.pm deleted file mode 100644 index b543b68750..0000000000 --- a/selftest/output/subunit.pm +++ /dev/null @@ -1,101 +0,0 @@ -#!/usr/bin/perl -# Subunit output for selftest -# Copyright (C) 2009 Jelmer Vernooij -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -package output::subunit; - -use Exporter; -@ISA = qw(Exporter); - -use FindBin qw($RealBin); -use lib "$RealBin/.."; - -use Subunit; - -use strict; - -sub new($) { - my ($class) = @_; - my $self = { }; - bless($self, $class); -} - -sub report_time($$) -{ - my ($self, $time) = @_; - Subunit::report_time($time); -} - -sub start_testsuite($$) -{ - my ($self, $name) = @_; - - $self->{NAME} = $name; - - Subunit::start_test($self->{NAME}); -} - -sub output_msg($$) -{ - my ($self, $output) = @_; - - print $output; -} - -sub control_msg($$) -{ - my ($self, $output) = @_; -} - -sub end_testsuite($$$$$$) -{ - my ($self, $name, $result, $unexpected, $reason) = @_; - - if ($result eq "failure" and not $unexpected) { $result = "xfail"; } - - Subunit::end_testsuite($name, $result, $reason); -} - -sub start_test($$) -{ - my ($self, $testname) = @_; - - Subunit::start_test($testname); -} - -sub end_test($$$$$) -{ - my ($self, $testname, $result, $unexpected, $reason) = @_; - - if ($result eq "fail" and not $unexpected) { $result = "xfail"; } - - Subunit::end_test($testname, $result, $reason); -} - -sub summary($) -{ - my ($self) = @_; -} - -sub skip_testsuite($$$$) -{ - my ($self, $name, $reason) = @_; - - Subunit::start_test($name); - Subunit::end_test($name, "skip", $reason); -} - -1; -- cgit