diff options
| author | Stefan Metzmacher <metze@samba.org> | 2009-01-30 08:25:27 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2009-01-30 09:36:53 +0100 |
| commit | 52a49b448e4a9ccd3044b47a9efaf15f30fbd032 (patch) | |
| tree | 92a8525252789111ab76d907ca1c25fdd5cb320c /selftest/target | |
| parent | 4e0a61970120e10a6309251a97e660697818fa8a (diff) | |
| download | samba-52a49b448e4a9ccd3044b47a9efaf15f30fbd032.tar.gz samba-52a49b448e4a9ccd3044b47a9efaf15f30fbd032.tar.bz2 samba-52a49b448e4a9ccd3044b47a9efaf15f30fbd032.zip | |
selftest: allow environment options
We support "local" and "client" (default) now.
We can decide if we want to run a client against the server
(with a special client.conf) or if we want to run tests localy
on the server with the same config as the server.
metze
Diffstat (limited to 'selftest/target')
| -rw-r--r-- | selftest/target/Samba4.pm | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index 97f9878828..208824d6b2 100644 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -751,10 +751,14 @@ nogroup:x:65534:nobody WINBINDD_SOCKET_DIR => $winbindd_socket_dir, NCALRPCDIR => $ncalrpcdir, LOCKDIR => $lockdir, + SERVERCONFFILE => $conffile, CONFIGURATION => $configuration, SOCKET_WRAPPER_DEFAULT_IFACE => $swiface, NSS_WRAPPER_PASSWD => $nsswrap_passwd, NSS_WRAPPER_GROUP => $nsswrap_group, + SMBD_TEST_FIFO => "$prefix/smbd_test.fifo", + SMBD_TEST_LOG => "$prefix/smbd_test.log", + SMBD_TEST_LOG_POS => 0, }; if (defined($self->{ldap})) { @@ -812,10 +816,6 @@ sub provision_member($$$) system($cmd) == 0 or die("Join failed\n$cmd"); - $ret->{SMBD_TEST_FIFO} = "$prefix/smbd_test.fifo"; - $ret->{SMBD_TEST_LOG} = "$prefix/smbd_test.log"; - $ret->{SMBD_TEST_LOG_POS} = 0; - $ret->{DC_SERVER} = $dcvars->{SERVER}; $ret->{DC_SERVER_IP} = $dcvars->{SERVER_IP}; $ret->{DC_NETBIOSNAME} = $dcvars->{NETBIOSNAME}; @@ -841,9 +841,6 @@ sub provision_dc($$) $self->add_wins_config("$prefix/private") or die("Unable to add wins configuration"); - $ret->{SMBD_TEST_FIFO} = "$prefix/server_test.fifo"; - $ret->{SMBD_TEST_LOG} = "$prefix/server_test.log"; - $ret->{SMBD_TEST_LOG_POS} = 0; return $ret; } |