From cb04f015eee8da5efa8f6fd2fb8e6493e3e7aa9b Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 4 Apr 2007 14:24:44 +0000
Subject: r22077: Import only necessary test variables, more refactoring. (This
 used to be commit 150bb2238ea91ead3bdde0a34ff801b79bc83ec3)

---
 source4/script/tests/SocketWrapper.pm |  1 +
 source4/script/tests/mktestdc.sh      |  1 -
 source4/script/tests/selftest.pl      | 14 ++++++++------
 source4/script/tests/tests_quick.sh   |  1 -
 4 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'source4/script/tests')

diff --git a/source4/script/tests/SocketWrapper.pm b/source4/script/tests/SocketWrapper.pm
index d01aba829e..9f6c879663 100644
--- a/source4/script/tests/SocketWrapper.pm
+++ b/source4/script/tests/SocketWrapper.pm
@@ -31,6 +31,7 @@ sub setup_pcap($)
 {
 	my ($pcap_file) = @_;
 
+	$ENV{SOCKET_WRAPPER_PCAP_FILE} = $pcap_file;
 }
 
 sub set_default_iface($)
diff --git a/source4/script/tests/mktestdc.sh b/source4/script/tests/mktestdc.sh
index 70c4b43f1a..3c5cc58353 100755
--- a/source4/script/tests/mktestdc.sh
+++ b/source4/script/tests/mktestdc.sh
@@ -300,7 +300,6 @@ echo "BASEDN=$BASEDN"
 echo "PASSWORD=$PASSWORD"
 echo "SRCDIR=$SRCDIR"
 echo "PREFIX=$PREFIX"
-echo "SMBD_LOGLEVEL=$SMBD_LOGLEVEL"
 echo "LDAPDIR=$LDAPDIR"
 echo "PROVISION_OPTIONS=$PROVISION_OPTIONS"
 echo "PROVISION_ACI=$PROVISION_ACI"
diff --git a/source4/script/tests/selftest.pl b/source4/script/tests/selftest.pl
index 52311347fe..247cd0b346 100755
--- a/source4/script/tests/selftest.pl
+++ b/source4/script/tests/selftest.pl
@@ -387,14 +387,13 @@ $ENV{PATH} = "$old_pwd/bin:$ENV{PATH}";
 my @torture_options = ();
 
 if ($opt_socket_wrapper_pcap) {
-	$ENV{SOCKET_WRAPPER_PCAP_FILE} = $opt_socket_wrapper_pcap;
+	SocketWrapper::setup_pcap($opt_socket_wrapper_pcap);
 	# Socket wrapper pcap implies socket wrapper
 	$opt_socket_wrapper = 1;
 }
 
 my $socket_wrapper_dir;
-if ($opt_socket_wrapper) 
-{
+if ($opt_socket_wrapper) {
 	$socket_wrapper_dir = SocketWrapper::setup_dir("$prefix/w");
 	print "SOCKET_WRAPPER_DIR=$socket_wrapper_dir\n";
 } else {
@@ -433,10 +432,13 @@ if (defined($opt_skip)) {
 
 my $testenv_vars = $target->setup_env("dc", "$prefix/dc", $socket_wrapper_dir);
 
-foreach (keys %$testenv_vars) { $ENV{$_} = $testenv_vars->{$_}; }
-
 SocketWrapper::set_default_iface(6);
 
+foreach ("PASSWORD", "DOMAIN", "SERVER", "CONFIGURATION", 
+	      "USERNAME", "PREFIX", "NETBIOSNAME", "KRB5_CONFIG") {
+	$ENV{$_} = $testenv_vars->{$_};
+}
+
 my $interfaces = join(',', ("127.0.0.6/8", 
 		                 "127.0.0.7/8",
 						 "127.0.0.8/8",
@@ -514,7 +516,7 @@ NETBIOSNAME=\$NETBIOSNAME\" && bash'");
 			next;
 		}
 
-		# $target->setup_env($envname);
+		# $target->setup_env($envname, "$prefix/$envname", $socket_wrapper_dir);
 
 		if ($from_build_farm) {
 			run_test_buildfarm($name, $cmd, $i, $suitestotal);
diff --git a/source4/script/tests/tests_quick.sh b/source4/script/tests/tests_quick.sh
index 703f9dc294..f66b035e7e 100755
--- a/source4/script/tests/tests_quick.sh
+++ b/source4/script/tests/tests_quick.sh
@@ -7,4 +7,3 @@ $SRCDIR/script/tests/test_ldap.sh $SERVER $USERNAME $PASSWORD
 $SRCDIR/script/tests/test_nbt.sh $SERVER $USERNAME $PASSWORD
 $SRCDIR/script/tests/test_quick.sh //$SERVER/cifs $USERNAME $PASSWORD ""
 $SRCDIR/script/tests/test_rpc_quick.sh $SERVER $USERNAME $PASSWORD $DOMAIN
-#$SRCDIR/script/tests/test_cifsposix.sh //$SERVER/cifsposixtestshare $USERNAME $PASSWORD "" || totalfailed=`expr $totalfailed + $?`
-- 
cgit