[SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  4a8d55c selftest: Remove unused vde functions.
       via  9654c61 selftest/README: Expand inconsistent tabs
       via  f75746e selftest: Remove outdated template.
       via  ed92f3d selftest: Remove unused and broken target 'windows'.
      from  cc17dde samba.7: Remove references to long gone testprns and smbsh utilities.

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


- Log -----------------------------------------------------------------
commit 4a8d55cd7d27fcce6f4bedb6af48a7698a3be86e
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Mar 4 05:08:26 2012 +0100

    selftest: Remove unused vde functions.
    
    Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
    Autobuild-Date: Sun Mar  4 07:54:51 CET 2012 on sn-devel-104

commit 9654c61a9f1bb59ad3e59e59709b732635587993
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Mar 4 01:20:03 2012 +0100

    selftest/README: Expand inconsistent tabs

commit f75746e353778113c9fa539336be145d3a12ce24
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Mar 4 01:19:17 2012 +0100

    selftest: Remove outdated template.

commit ed92f3de63313eaa269f8f0aca1e7176fc87c18f
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Mar 4 01:18:58 2012 +0100

    selftest: Remove unused and broken target 'windows'.

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

Summary of changes:
 selftest/README             |   22 ++++++++++----------
 selftest/selftest.pl        |   31 ----------------------------
 selftest/target/Template.pm |   47 -------------------------------------------
 selftest/target/Windows.pm  |   40 ------------------------------------
 4 files changed, 11 insertions(+), 129 deletions(-)
 delete mode 100644 selftest/target/Template.pm
 delete mode 100644 selftest/target/Windows.pm


Changeset truncated at 500 lines:

diff --git a/selftest/README b/selftest/README
index 206f864..c23d730 100644
--- a/selftest/README
+++ b/selftest/README
@@ -84,22 +84,22 @@ The environments are currently available include
    be set:
 
      * USERNAME: Administrator user name
-	 * PASSWORD: Administrator password
-	 * DOMAIN: Domain name
-	 * REALM: Realm name
-	 * SERVER: DC host name 
-	 * SERVER_IP: DC IPv4 address
-	 * NETBIOSNAME: DC NetBIOS name
-	 * NETIOSALIAS: DC NetBIOS alias
+     * PASSWORD: Administrator password
+     * DOMAIN: Domain name
+     * REALM: Realm name
+     * SERVER: DC host name 
+     * SERVER_IP: DC IPv4 address
+     * NETBIOSNAME: DC NetBIOS name
+     * NETIOSALIAS: DC NetBIOS alias
 
  - member,s4member,s3member: Domain controller and member server that is joined to it set up. The
    following environment variables will be set:
 
      * USERNAME: Domain administrator user name
-	 * PASSWORD: Domain administrator password
-	 * DOMAIN: Domain name
-	 * REALM: Realm name
-	 * SERVER: Name of the member server
+     * PASSWORD: Domain administrator password
+     * DOMAIN: Domain name
+     * REALM: Realm name
+     * SERVER: Name of the member server
 
 See Samba.pm, Samba3.pm and Samba4.pm for the full list.
 
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index a6d4e14..7328300 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -384,40 +384,9 @@ unless ($opt_list) {
 		$testenv_default = "member";
 		require target::Samba3;
 		$target = new Samba3($bindir, \%binary_mapping, $srcdir_abs, $server_maxtime);
-	} elsif ($opt_target eq "win") {
-		die("Windows tests will not run with socket wrapper enabled.") 
-			if ($opt_socket_wrapper);
-		$testenv_default = "dc";
-		require target::Windows;
-		$target = new Windows();
 	}
 }
 
-#
-# Start a Virtual Distributed Ethernet Switch
-# Returns the pid of the switch.
-#
-sub start_vde_switch($)
-{
-	my ($path) = @_;
-
-	system("vde_switch --pidfile $path/vde.pid --sock $path/vde.sock --daemon");
-
-	open(PID, "$path/vde.pid");
-	<PID> =~ /([0-9]+)/;
-	my $pid = $1;
-	close(PID);
-
-	return $pid;
-}
-
-# Stop a Virtual Distributed Ethernet Switch
-sub stop_vde_switch($)
-{
-	my ($pid) = @_;
-	kill 9, $pid;
-}
-
 sub read_test_regexes($)
 {
 	my ($name) = @_;
diff --git a/selftest/target/Template.pm b/selftest/target/Template.pm
deleted file mode 100644
index 2b47ad1..0000000
--- a/selftest/target/Template.pm
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/perl
-# Copyright (C) 2009 Stefan Metzmacher <metze at samba.org>
-# Published under the GNU GPL, v3 or later.
-
-package Template;
-
-use strict;
-
-sub new($$) {
-	my ($classname) = @_;
-	my $self = {
-		classname => $classname
-	};
-	bless $self;
-	return $self;
-}
-
-sub teardown_env($$)
-{
-	my ($self, $envvars) = @_;
-
-	return 0;
-}
-
-sub getlog_env($$)
-{
-	my ($self, $envvars) = @_;
-
-	return "";
-}
-
-sub check_env($$)
-{
-	my ($self, $envvars) = @_;
-
-	return 1;
-}
-
-sub setup_env($$$)
-{
-	my ($self, $envname, $path) = @_;
-	my $envvars = undef;
-
-	return $envvars;
-}
-
-1;
diff --git a/selftest/target/Windows.pm b/selftest/target/Windows.pm
deleted file mode 100644
index d0c90d7..0000000
--- a/selftest/target/Windows.pm
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/perl
-# Bootstrap Samba and run a number of tests against it.
-# Copyright (C) 2005-2007 Jelmer Vernooij <jelmer at samba.org>
-# Published under the GNU GPL, v3 or later.
-
-package Windows;
-
-use strict;
-use FindBin qw($RealBin);
-use POSIX;
-
-sub new($)
-{
-	my ($classname) = @_;
-	my $self = { };
-	bless $self;
-	return $self;
-}
-
-sub provision($$$)
-{
-	my ($self, $environment, $prefix) = @_;
-
-	die ("Windows tests will not run without root privileges.") 
-		if (`whoami` ne "root");
-
-	die("Environment variable WINTESTCONF has not been defined.\n".
-		"Windows tests will not run unconfigured.") if (not defined($ENV{WINTESTCONF}));
-
-	die ("$ENV{WINTESTCONF} could not be read.") if (! -r $ENV{WINTESTCONF});
-
-	$ENV{WINTEST_DIR}="$ENV{SRCDIR}/selftest/win";
-}
-
-sub setup_env($$)
-{
-	my ($self, $name) = @_;
-}
-
-1;


-- 
Samba Shared Repository