svn commit: samba r22233 - in
branches/SAMBA_4_0/source/script/tests: .
abartlet at samba.org
abartlet at samba.org
Mon Apr 16 03:16:24 GMT 2007
Author: abartlet
Date: 2007-04-16 03:16:23 +0000 (Mon, 16 Apr 2007)
New Revision: 22233
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22233
Log:
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
Modified:
branches/SAMBA_4_0/source/script/tests/selftest.pl
branches/SAMBA_4_0/source/script/tests/test_blackbox.sh
Changeset:
Modified: branches/SAMBA_4_0/source/script/tests/selftest.pl
===================================================================
--- branches/SAMBA_4_0/source/script/tests/selftest.pl 2007-04-16 00:29:13 UTC (rev 22232)
+++ branches/SAMBA_4_0/source/script/tests/selftest.pl 2007-04-16 03:16:23 UTC (rev 22233)
@@ -556,7 +556,7 @@
}
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 @@
}
}
+ SocketWrapper::set_default_iface(6);
+
$running_envs{$envname} = $testenv_vars;
return $testenv_vars;
}
@@ -574,8 +576,8 @@
$target->teardown_env($running_envs{$envname});
delete $running_envs{$envname};
}
-SocketWrapper::set_default_iface(6);
+
if ($opt_testenv) {
my $testenv_vars = setup_env("dc");
$ENV{PIDDIR} = $testenv_vars->{PIDDIR};
Modified: branches/SAMBA_4_0/source/script/tests/test_blackbox.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/test_blackbox.sh 2007-04-16 00:29:13 UTC (rev 22232)
+++ branches/SAMBA_4_0/source/script/tests/test_blackbox.sh 2007-04-16 03:16:23 UTC (rev 22233)
@@ -17,4 +17,6 @@
. $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"
More information about the samba-cvs
mailing list