s4:selftest Provide "state dir" and "cache dir" to selftest

This helps when s3compat is built into the tree, as it needs these set.

Andrew Bartlett

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index e82ccfdfab264d0aeff95d8bc47cc845a746199b..e47f4f3510e1fab9551cf0f9d674fc31a39274f4 100644 (file)
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -490,6 +490,8 @@ sub provision_raw_prepare($$$$$$$)
        $ctx->{privatedir} = "$prefix_abs/private";
        $ctx->{ncalrpcdir} = "$prefix_abs/ncalrpc";
        $ctx->{lockdir} = "$prefix_abs/lockdir";
+       $ctx->{cachedir} = "$prefix_abs/cachedir";
+       $ctx->{statedir} = "$prefix_abs/statedir";
        $ctx->{winbindd_socket_dir} = "$prefix_abs/winbindd_socket";
        $ctx->{winbindd_privileged_socket_dir} = "$prefix_abs/winbindd_privileged_socket";
        $ctx->{ntp_signd_socket_dir} = "$prefix_abs/ntp_signd_socket";
@@ -509,6 +511,8 @@ sub provision_raw_prepare($$$$$$$)
        push(@{$ctx->{directories}}, $ctx->{piddir});
        push(@{$ctx->{directories}}, $ctx->{ncalrpcdir});
        push(@{$ctx->{directories}}, $ctx->{lockdir});
+       push(@{$ctx->{directories}}, $ctx->{cachedir});
+       push(@{$ctx->{directories}}, $ctx->{statedir});
 
        $ctx->{smb_conf_extra_options} = "";
 
@@ -563,9 +567,11 @@ sub provision_raw_step1($$)
        workgroup = $ctx->{domain}
        realm = $ctx->{realm}
        private dir = $ctx->{privatedir}
+       state dir = $ctx->{statedir}
        pid directory = $ctx->{piddir}
        ncalrpc dir = $ctx->{ncalrpcdir}
        lock dir = $ctx->{lockdir}
+       cache dir = $ctx->{cachedir}
        setup directory = $self->{setupdir}
        modules dir = $self->{bindir}/modules
        winbindd socket directory = $ctx->{winbindd_socket_dir}