[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-2274-gc418af2

[Jelmer Vernooij]

The branch, master has been updated
       via  c418af2456d6c1ac18a8e31fa5ad808b572d1378 (commit)
       via  994a4d35fc21e2b74ed7db0d5591c530658c088d (commit)
      from  6c5c99130462ecddb449e99138c88930003325a3 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit c418af2456d6c1ac18a8e31fa5ad808b572d1378
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Fri Jun 12 01:00:30 2009 +0200

    ad-schema/license.txt: Fix typo.

commit 994a4d35fc21e2b74ed7db0d5591c530658c088d
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Fri Jun 12 00:53:27 2009 +0200

    format-subunit: Remove subunit output module.
    
    We can still use "cat" to obtain a subunit stream from a subunit stream. :-)

-----------------------------------------------------------------------

Summary of changes:
 selftest/format-subunit.pl          |    3 -
 selftest/output/subunit.pm          |  101 -----------------------------------
 source4/setup/ad-schema/licence.txt |    4 +-
 3 files changed, 2 insertions(+), 106 deletions(-)
 delete mode 100644 selftest/output/subunit.pm


Changeset truncated at 500 lines:

diff --git a/selftest/format-subunit.pl b/selftest/format-subunit.pl
index 77e4b34..629d02a 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 b543b68..0000000
--- a/selftest/output/subunit.pm
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/usr/bin/perl
-# Subunit output for selftest
-# Copyright (C) 2009 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::subunit;
-
-use Exporter;
- at 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;
diff --git a/source4/setup/ad-schema/licence.txt b/source4/setup/ad-schema/licence.txt
index 490525c..6362e84 100644
--- a/source4/setup/ad-schema/licence.txt
+++ b/source4/setup/ad-schema/licence.txt
@@ -1,7 +1,7 @@
 NOTE:
 
 The licence on these schema files is not GPL, or a standard Open
-Source licence.  Be careful to redistribute thes files as part of
+Source licence.  Be careful to redistribute these files as part of
 Samba or 'your implementation', but not alone.
 
-See each file for it's licence from Microsoft
+See each file for it's licence from Microsoft.


-- 
Samba Shared Repository