selftest: Remove existing buildfarm output format.
authorJelmer Vernooij <jelmer@samba.org>
Fri, 12 Jun 2009 12:21:15 +0000 (14:21 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 12 Jun 2009 12:21:15 +0000 (14:21 +0200)
selftest/format-subunit.pl
selftest/output/buildfarm.pm [deleted file]

index 629d02a055ad1d41f88ef1bd6055df39fbb6bdfd..9d4e0c07855908d4a32fa5d8afa7707a4060fc8e 100755 (executable)
@@ -23,7 +23,7 @@ Show errors as soon as they happen rather than at the end of the test run.
 
 =item I<--format>=FORMAT
 
 
 =item I<--format>=FORMAT
 
-Choose the format to print. Currently supported are plain, html or buildfarm.
+Choose the format to print. Currently supported are plain or html.
 
 =head1 LICENSE
 
 
 =head1 LICENSE
 
@@ -57,11 +57,6 @@ my $result = GetOptions (
 
 exit(1) if (not $result);
 
 
 exit(1) if (not $result);
 
-if (defined($ENV{RUN_FROM_BUILD_FARM}) and 
-       ($ENV{RUN_FROM_BUILD_FARM} eq "yes")) {
-       $opt_format = "buildfarm";
-}
-
 my $msg_ops;
 
 my $statistics = {
 my $msg_ops;
 
 my $statistics = {
@@ -75,10 +70,7 @@ my $statistics = {
        TESTS_SKIP => 0,
 };
 
        TESTS_SKIP => 0,
 };
 
-if ($opt_format eq "buildfarm") {
-       require output::buildfarm;
-       $msg_ops = new output::buildfarm($statistics);
-} elsif ($opt_format eq "plain") {
+if ($opt_format eq "plain") {
        require output::plain;
        $msg_ops = new output::plain("$opt_prefix/summary", $opt_verbose, $opt_immediate, $statistics, undef);
 } elsif ($opt_format eq "html") {
        require output::plain;
        $msg_ops = new output::plain("$opt_prefix/summary", $opt_verbose, $opt_immediate, $statistics, undef);
 } elsif ($opt_format eq "html") {
diff --git a/selftest/output/buildfarm.pm b/selftest/output/buildfarm.pm
deleted file mode 100644 (file)
index 8612cfb..0000000
+++ /dev/null
@@ -1,140 +0,0 @@
-#!/usr/bin/perl
-# Buildfarm output for selftest
-# Copyright (C) 2008 Jelmer Vernooij <jelmer@samba.org>
-#
-# 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 <http://www.gnu.org/licenses/>.
-
-package output::buildfarm;
-
-use Exporter;
-@ISA = qw(Exporter);
-
-use FindBin qw($RealBin);
-use lib "$RealBin/..";
-
-use BuildFarm;
-
-use strict;
-
-sub new($$$) {
-       my ($class, $statistics) = @_;
-       my $self = {
-               test_output => {},
-               statistics => $statistics,
-               last_time => 0,
-               start_time => undef,
-       };
-       bless($self, $class);
-}
-
-sub testsuite_count($$)
-{
-}
-
-sub report_time($$)
-{
-       my ($self, $time) = @_;
-
-       unless ($self->{start_time}) {
-               $self->{start_time} = $time;
-       }
-
-       $self->{last_time} = $time;
-}
-
-sub start_testsuite($$)
-{
-       my ($self, $name) = @_;
-
-       $self->{NAME} = $name;
-       $self->{START_TIME} = $self->{last_time};
-
-       my $duration = $self->{START_TIME} - $self->{start_time};
-       BuildFarm::start_testsuite($name, $duration);
-       $self->{test_output}->{$name} = "";
-}
-
-sub output_msg($$)
-{
-       my ($self, $output) = @_;
-
-       if (defined($self->{NAME})) {
-               $self->{test_output}->{$self->{NAME}} .= $output;
-       } else {
-               print $output;
-       }
-}
-
-sub control_msg($$)
-{
-       my ($self, $output) = @_;
-
-       if (defined($self->{NAME})) {
-               $self->{test_output}->{$self->{NAME}} .= $output;
-       } else {
-               print $output;
-       }
-}
-
-sub end_testsuite($$$$$)
-{
-       my ($self, $name, $result, $reason) = @_;
-
-       my $unexpected;
-       if ($result eq "failure" or $result eq "fail" or $result eq "error") {
-               $unexpected = 1;
-       } else {
-               $unexpected = 0;
-       }
-
-       BuildFarm::end_testsuite($name, ($self->{last_time} - $self->{START_TIME}), 
-                                    (not $unexpected), $self->{test_output}->{$name}, 
-                                                        $reason);
-       if ($result ne "success") {
-               $self->{statistics}->{SUITES_FAIL}++;
-       }
-       $self->{NAME} = undef;
-}
-
-sub start_test($$$)
-{
-       my ($self, $testname) = @_;
-}
-
-sub end_test($$$$$)
-{
-       my ($self, $testname, $result, $unexpected, $reason) = @_;
-
-       if ($unexpected) {
-               $self->{test_output}->{$self->{NAME}} .= "UNEXPECTED($result): $testname\n";
-       }
-}
-
-sub summary($)
-{
-       my ($self) = @_;
-       
-       BuildFarm::summary($self->{last_time} - $self->{start_time});
-
-       print "TEST STATUS: $self->{statistics}->{SUITES_FAIL}\n";
-}
-
-sub skip_testsuite($$$)
-{
-       my ($self, $name, $reason) = @_;
-
-       BuildFarm::skip_testsuite($name);
-}
-
-1;