diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2007-04-16 03:16:23 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:50:41 -0500 |
| commit | 3f7d52d538b9d717ce351284d5860e2ac8e5f294 (patch) | |
| tree | f7033f67f3817b3a243fdfc1758a6e0a224e5999 | |
| parent | 71c5586d306d52f0ca96c2aa8c7ecd5d79005a1d (diff) | |
| download | samba-3f7d52d538b9d717ce351284d5860e2ac8e5f294.tar.gz samba-3f7d52d538b9d717ce351284d5860e2ac8e5f294.tar.bz2 samba-3f7d52d538b9d717ce351284d5860e2ac8e5f294.zip | |
r22233: Allow 'REALM' as a global environment variable in the tests.
Set the default socket_wrapper interface inside the test env setup, so
it actually stays (fixes LOCAL-SOCKET failures).
Andrew Bartlett
(This used to be commit 783c57bf1c0f3dd4249302857936a2b6595e0a7b)
| -rwxr-xr-x | source4/script/tests/selftest.pl | 6 | ||||
| -rwxr-xr-x | source4/script/tests/test_blackbox.sh | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/source4/script/tests/selftest.pl b/source4/script/tests/selftest.pl index fa4de4dde4..d5576d5767 100755 --- a/source4/script/tests/selftest.pl +++ b/source4/script/tests/selftest.pl @@ -556,7 +556,7 @@ sub setup_env($) } write_clientconf($conffile, $testenv_vars); foreach ("PASSWORD", "DOMAIN", "SERVER", "USERNAME", "NETBIOSNAME", - "KRB5_CONFIG") { + "KRB5_CONFIG", "REALM") { if (defined($testenv_vars->{$_})) { $ENV{$_} = $testenv_vars->{$_}; } else { @@ -564,6 +564,8 @@ sub setup_env($) } } + SocketWrapper::set_default_iface(6); + $running_envs{$envname} = $testenv_vars; return $testenv_vars; } @@ -574,7 +576,7 @@ sub teardown_env($) $target->teardown_env($running_envs{$envname}); delete $running_envs{$envname}; } -SocketWrapper::set_default_iface(6); + if ($opt_testenv) { my $testenv_vars = setup_env("dc"); diff --git a/source4/script/tests/test_blackbox.sh b/source4/script/tests/test_blackbox.sh index 9adafcb332..1cab39c8f7 100755 --- a/source4/script/tests/test_blackbox.sh +++ b/source4/script/tests/test_blackbox.sh @@ -17,4 +17,6 @@ incdir=`dirname $0` . $incdir/test_functions.sh plantest "blackbox.smbclient" dc $incdir/../../../testprogs/blackbox/test_smbclient.sh "\$NETBIOSNAME" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$PREFIX" "$ADDARGS" +plantest "blackbox.kinit" dc $incdir/../../../testprogs/blackbox/test_kinit.sh "\$NETBIOSNAME" "\$USERNAME" "\$PASSWORD" "\$REALM" "$PREFIX" "$ADDARGS" + plantest "blackbox.cifsdd" dc $incdir/../../../testprogs/blackbox/test_cifsdd.sh "\$NETBIOSNAME" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$ADDARGS" |