Rev 11788: Import only necessary test variables, more refactoring. in file:///home/jelmer/bzr.samba/SAMBA_4_0/

[Jelmer Vernooij]

At file:///home/jelmer/bzr.samba/SAMBA_4_0/

------------------------------------------------------------
revno: 11788
revision-id: jelmer at samba.org-20070404152419-zpsd7561fkx0amox
parent: svn-v2:22076 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: SAMBA_4_0
timestamp: Wed 2007-04-04 17:24:19 +0200
message:
  Import only necessary test variables, more refactoring.
modified:
  source/rpc_server/epmapper/rpc_epmapper.c svn-v2:6 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2frpc_server%2fepmapper%2frpc_epmapper.c
  source/script/tests/SocketWrapper.pm svn-v2:21707 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscript%2ftests%2fSocketWrapper.pm
  source/script/tests/mktestdc.sh svn-v2:21909 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscript%2ftests%2fmktestdc.sh
  source/script/tests/selftest.pl svn-v2:20693 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscript%2ftests%2fselftest.pl
  source/script/tests/tests_quick.sh svn-v2:8525 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscript%2ftests%2ftests_quick.sh
=== modified file 'source/rpc_server/epmapper/rpc_epmapper.c'
--- a/source/rpc_server/epmapper/rpc_epmapper.c	2007-01-17 14:49:36 +0000
+++ b/source/rpc_server/epmapper/rpc_epmapper.c	2007-04-04 15:24:19 +0000
@@ -80,8 +80,7 @@
 }
 
 
-static error_status_t dcesrv_epm_Insert(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, 
-				 struct epm_Insert *r)
+static error_status_t dcesrv_epm_Insert(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct epm_Insert *r)
 {
 	DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);
 }

=== modified file 'source/script/tests/SocketWrapper.pm'
--- a/source/script/tests/SocketWrapper.pm	2007-03-12 00:24:03 +0000
+++ b/source/script/tests/SocketWrapper.pm	2007-04-04 15:24:19 +0000
@@ -31,6 +31,7 @@
 {
 	my ($pcap_file) = @_;
 
+	$ENV{SOCKET_WRAPPER_PCAP_FILE} = $pcap_file;
 }
 
 sub set_default_iface($)

=== modified file 'source/script/tests/mktestdc.sh'
--- a/source/script/tests/mktestdc.sh	2007-04-04 12:40:19 +0000
+++ b/source/script/tests/mktestdc.sh	2007-04-04 15:24:19 +0000
@@ -300,7 +300,6 @@
 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"

=== modified file 'source/script/tests/selftest.pl'
--- a/source/script/tests/selftest.pl	2007-04-04 12:23:10 +0000
+++ b/source/script/tests/selftest.pl	2007-04-04 15:24:19 +0000
@@ -387,14 +387,13 @@
 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 @@
 
 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 @@
 			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);

=== modified file 'source/script/tests/tests_quick.sh'
--- a/source/script/tests/tests_quick.sh	2007-03-07 20:33:15 +0000
+++ b/source/script/tests/tests_quick.sh	2007-04-04 15:24:19 +0000
@@ -7,4 +7,3 @@
 $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 + $?`