summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-04-08 23:55:01 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:49:53 -0500
commit51fd15608173421258cc474063cf49f5b72e5d56 (patch)
treea76d5d7c8c679b24613c2de014b824a41d2df3fa /source4
parenta16989b1e970b93b0f8eaa3a65046d072c57f076 (diff)
downloadsamba-51fd15608173421258cc474063cf49f5b72e5d56.tar.gz
samba-51fd15608173421258cc474063cf49f5b72e5d56.tar.bz2
samba-51fd15608173421258cc474063cf49f5b72e5d56.zip
r22133: Don't push parameters into environment until necessary.
(This used to be commit 290815d180b2bf0ba24744b3796905096d07d7b7)
Diffstat (limited to 'source4')
-rwxr-xr-xsource4/script/tests/selftest.pl10
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/script/tests/selftest.pl b/source4/script/tests/selftest.pl
index 5c9c0034f0..caba948c9b 100755
--- a/source4/script/tests/selftest.pl
+++ b/source4/script/tests/selftest.pl
@@ -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