[SCM] Samba Shared Repository - branch master updated -
release-4-0-0alpha7-2277-g13e1654
Jelmer Vernooij
jelmer at samba.org
Fri Jun 12 12:21:42 GMT 2009
The branch, master has been updated
via 13e1654c4a1f8cf2ec38d4d56ae79790b7926c62 (commit)
via 8c10fb7f004bfaa0318e347893847203c1bee9ea (commit)
from ba4a047b360c14587430d9bca6c7bf3a88445d6a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 13e1654c4a1f8cf2ec38d4d56ae79790b7926c62
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Jun 12 14:21:15 2009 +0200
selftest: Remove existing buildfarm output format.
commit 8c10fb7f004bfaa0318e347893847203c1bee9ea
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Jun 12 14:21:03 2009 +0200
selftest: Output subunit on the buildfarm.
-----------------------------------------------------------------------
Summary of changes:
selftest/format-subunit.pl | 12 +---
selftest/output/buildfarm.pm | 140 ------------------------------------------
source4/selftest/config.mk | 5 ++
3 files changed, 7 insertions(+), 150 deletions(-)
delete mode 100644 selftest/output/buildfarm.pm
Changeset truncated at 500 lines:
diff --git a/selftest/format-subunit.pl b/selftest/format-subunit.pl
index 629d02a..9d4e0c0 100755
--- a/selftest/format-subunit.pl
+++ b/selftest/format-subunit.pl
@@ -23,7 +23,7 @@ Show errors as soon as they happen rather than at the end of the test run.
=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
@@ -57,11 +57,6 @@ my $result = GetOptions (
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 = {
@@ -75,10 +70,7 @@ my $statistics = {
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") {
diff --git a/selftest/output/buildfarm.pm b/selftest/output/buildfarm.pm
deleted file mode 100644
index 8612cfb..0000000
--- a/selftest/output/buildfarm.pm
+++ /dev/null
@@ -1,140 +0,0 @@
-#!/usr/bin/perl
-# Buildfarm output for selftest
-# Copyright (C) 2008 Jelmer Vernooij <jelmer at 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;
- at 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;
diff --git a/source4/selftest/config.mk b/source4/selftest/config.mk
index 328ae09..e6b338b 100644
--- a/source4/selftest/config.mk
+++ b/source4/selftest/config.mk
@@ -17,8 +17,13 @@ test-subunit:: everything
slowtest:: everything
$(SELFTEST) $(DEFAULT_TEST_OPTIONS) $(TESTS) | $(FORMAT_TEST_OUTPUT) --immediate
+ifeq ($(RUN_FROM_BUILD_FARM),yes)
+test:: everything
+ $(SELFTEST) $(SELFTEST_NOSLOW_OPTS) $(DEFAULT_TEST_OPTIONS) $(TESTS) | $(FILTER_XFAIL)
+else
test:: everything
$(SELFTEST) $(SELFTEST_NOSLOW_OPTS) $(DEFAULT_TEST_OPTIONS) $(TESTS) | $(FORMAT_TEST_OUTPUT) --immediate
+endif
kvmtest:: everything
$(SELFTEST) $(SELFTEST_NOSLOW_OPTS) $(DEFAULT_TEST_OPTIONS) \
--
Samba Shared Repository
More information about the samba-cvs
mailing list