diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-05-08 10:32:01 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-05-08 19:00:29 +0200 |
| commit | f4d9b40d7ff8f9e79972294c9dce2a52a67df24f (patch) | |
| tree | 29c91562a007a518bba245b32292a2e22f8ce423 /selftest | |
| parent | aae9353ecf56323b63da66aa84d8a0a4f219d94d (diff) | |
| download | samba-f4d9b40d7ff8f9e79972294c9dce2a52a67df24f.tar.gz samba-f4d9b40d7ff8f9e79972294c9dce2a52a67df24f.tar.xz samba-f4d9b40d7ff8f9e79972294c9dce2a52a67df24f.zip | |
selftest: Make the ncalrpc dir common between Samba4 and Samba3.
This also avoids creating the directory, as the startup routines will
create it with the correct permissions.
Andrew Bartlett
Diffstat (limited to 'selftest')
| -rw-r--r-- | selftest/target/Samba3.pm | 12 | ||||
| -rw-r--r-- | selftest/target/Samba4.pm | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index 66ae8b5ec7..e99498b9b4 100644 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -292,7 +292,7 @@ sub setup_plugin_s4_dc($$$$) "plugindc", $iface, "pluGin${iface}Pass", - $plugin_s4_dc_options); + $plugin_s4_dc_options, 1); $ret or return undef; @@ -634,9 +634,9 @@ sub check_or_start($$$$) { return 0; } -sub provision($$$$$$) +sub provision($$$$$$$) { - my ($self, $prefix, $server, $swiface, $password, $extra_options) = @_; + my ($self, $prefix, $server, $swiface, $password, $extra_options, $no_delete_prefix) = @_; ## ## setup the various environment variables we need @@ -714,7 +714,9 @@ sub provision($$$$$$) mkdir($prefix_abs, 0777); print "CREATE TEST ENVIRONMENT IN '$prefix'..."; - system("rm -rf $prefix_abs/*"); + if (not defined($no_delete_prefix) or not $no_delete_prefix) { + system("rm -rf $prefix_abs/*"); + } mkdir($_, 0777) foreach(@dirs); ## @@ -861,7 +863,7 @@ sub provision($$$$$$) queue resume command = $bindir_abs/vlp tdbfile=$lockdir/vlp.tdb queueresume %p lpq cache time = 0 - ncalrpc dir = $lockdir/ncalrpc + ncalrpc dir = $prefix_abs/ncalrpc rpc_server:epmapper = embedded resolv:host file = $dns_host_file diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index e5ee391be2..bbe64a9a8a 100644 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -522,7 +522,6 @@ sub provision_raw_prepare($$$$$$$$$$) push(@{$ctx->{directories}}, $ctx->{privatedir}); push(@{$ctx->{directories}}, $ctx->{etcdir}); push(@{$ctx->{directories}}, $ctx->{piddir}); - push(@{$ctx->{directories}}, $ctx->{ncalrpcdir}); push(@{$ctx->{directories}}, $ctx->{lockdir}); $ctx->{smb_conf_extra_options} = ""; @@ -611,7 +610,6 @@ sub provision_raw_step1($$) spn update command = $ENV{SRCDIR_ABS}/source4/scripting/bin/samba_spnupdate resolv:host file = $ctx->{dns_host_file} dreplsrv:periodic_startup_interval = 0 - ncalrpc dir = $ctx->{lockdir}/ncalrpc "; if (defined($ctx->{sid_generator}) && $ctx->{sid_generator} ne "internal") { |