sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

r22233: Allow 'REALM' as a global environment variable in the tests.

Browse Source 
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 783c57bf1c)
This commit is contained in:
Andrew Bartlett 2007-04-16 03:16:23 +00:00 committed by Gerald (Jerry) Carter
parent 71c5586d30
commit 3f7d52d538
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -556,7 +556,7 @@ sub setup_env($)
} }
write_clientconf($conffile, $testenv_vars); write_clientconf($conffile, $testenv_vars);
foreach ("PASSWORD", "DOMAIN", "SERVER", "USERNAME", "NETBIOSNAME", foreach ("PASSWORD", "DOMAIN", "SERVER", "USERNAME", "NETBIOSNAME",
"KRB5_CONFIG") { "KRB5_CONFIG", "REALM") {
if (defined($testenv_vars->{$_})) { if (defined($testenv_vars->{$_})) {
$ENV{$_} = $testenv_vars->{$_}; $ENV{$_} = $testenv_vars->{$_};
} else { } else {
@ -564,6 +564,8 @@ sub setup_env($)
} }
} }
SocketWrapper::set_default_iface(6);
$running_envs{$envname} = $testenv_vars; $running_envs{$envname} = $testenv_vars;
return $testenv_vars; return $testenv_vars;
} }
@ -574,7 +576,7 @@ sub teardown_env($)
$target->teardown_env($running_envs{$envname}); $target->teardown_env($running_envs{$envname});
delete $running_envs{$envname}; delete $running_envs{$envname};
} }
SocketWrapper::set_default_iface(6);
if ($opt_testenv) { if ($opt_testenv) {
my $testenv_vars = setup_env("dc"); my $testenv_vars = setup_env("dc");

2
source4/script/tests/test_blackbox.sh
View File

@ -17,4 +17,6 @@ incdir=`dirname $0`
. $incdir/test_functions.sh . $incdir/test_functions.sh
plantest "blackbox.smbclient" dc $incdir/../../../testprogs/blackbox/test_smbclient.sh "\$NETBIOSNAME" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$PREFIX" "$ADDARGS" 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" plantest "blackbox.cifsdd" dc $incdir/../../../testprogs/blackbox/test_cifsdd.sh "\$NETBIOSNAME" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$ADDARGS"