sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

r22133: Don't push parameters into environment until necessary.

Browse Source 
(This used to be commit 290815d180b2bf0ba24744b3796905096d07d7b7)
This commit is contained in:
Jelmer Vernooij 2007-04-08 23:55:01 +00:00 committed by Gerald (Jerry) Carter
parent a16989b1e9
commit 51fd156081
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source4/script/tests/selftest.pl
View File

@ -366,7 +366,6 @@ if ($ldap) {
$prefix =~ s+//+/+;
$ENV{PREFIX} = $prefix;
$ENV{SRCDIR} = $srcdir;
my $tls_enabled = not $opt_quick;
@ -384,8 +383,6 @@ if (defined($ENV{LD_LIBRARY_PATH})) {
$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 @@ my $testenv_vars = $target->setup_env("dc", "$prefix/dc", $socket_wrapper_dir);
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 @@ my $interfaces = join(',', ("127.0.0.6/8",
"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 @@ $| = 1;
# 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