svn commit: samba r22133 - in branches/SAMBA_4_0: . source/script/tests

[jelmer at samba.org]

Author: jelmer
Date: 2007-04-08 23:55:01 +0000 (Sun, 08 Apr 2007)
New Revision: 22133

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22133

Log:
Don't push parameters into environment until necessary.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/script/tests/selftest.pl


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:merge
...skipped...

Modified: branches/SAMBA_4_0/source/script/tests/selftest.pl
===================================================================
--- branches/SAMBA_4_0/source/script/tests/selftest.pl	2007-04-08 19:41:47 UTC (rev 22132)
+++ branches/SAMBA_4_0/source/script/tests/selftest.pl	2007-04-08 23:55:01 UTC (rev 22133)
@@ -366,7 +366,6 @@
 
 $prefix =~ s+//+/+;
 $ENV{PREFIX} = $prefix;
-
 $ENV{SRCDIR} = $srcdir;
 
 my $tls_enabled = not $opt_quick;
@@ -384,8 +383,6 @@
 $ENV{PKG_CONFIG_PATH} = "$old_pwd/bin/pkgconfig:$ENV{PKG_CONFIG_PATH}";
 $ENV{PATH} = "$old_pwd/bin:$ENV{PATH}";
 
-my @torture_options = ();
-
 if ($opt_socket_wrapper_pcap) {
 	SocketWrapper::setup_pcap($opt_socket_wrapper_pcap);
 	# Socket wrapper pcap implies socket wrapper
@@ -435,7 +432,7 @@
 SocketWrapper::set_default_iface(6);
 
 foreach ("PASSWORD", "DOMAIN", "SERVER", "CONFIGURATION", 
-	      "USERNAME", "PREFIX", "NETBIOSNAME", "KRB5_CONFIG", "PIDDIR") {
+	      "USERNAME", "NETBIOSNAME") {
 	$ENV{$_} = $testenv_vars->{$_};
 }
 
@@ -446,6 +443,7 @@
 						 "127.0.0.10/8",
 						 "127.0.0.11/8"));
 
+my @torture_options = ();
 push (@torture_options, "--option=interfaces=$interfaces");
 push (@torture_options, $testenv_vars->{CONFIGURATION});
 # ensure any one smbtorture call doesn't run too long
@@ -490,14 +488,16 @@
 # The Kerberos tests fail if this variable is set.
 delete $ENV{DOMAIN};
 
+$ENV{KRB5_CONFIG} = $testenv_vars->{KRB5_CONFIG};
+
 if ($opt_testenv) {
+	$ENV{PIDDIR} = $testenv_vars->{PIDDIR};
 	my $term = ($ENV{TERM} or "xterm");
 	system("$term -e 'echo -e \"Welcome to the Samba4 Test environment
 This matches the client environment used in make test
 smbd is pid `cat \$PIDDIR/smbd.pid`
 
 Some useful environment variables:
-AUTH=\$AUTH
 TORTURE_OPTIONS=\$TORTURE_OPTIONS
 CONFIGURATION=\$CONFIGURATION
 SERVER=\$SERVER