selftest/Samba4: setup "state dir" and "cache dir"

metze

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index d72c409fa26505796d0bd161e40d62ee2820577b..808be222bb173a19e89dd0ab130eeda156ecf132 100755 (executable)
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -597,6 +597,18 @@ sub write_clientconf($$$)
                mkdir("$clientdir/lockdir", 0777);
        }
 
+       if ( -d "$clientdir/statedir" ) {
+               unlink <$clientdir/statedir/*>;
+       } else {
+               mkdir("$clientdir/statedir", 0777);
+       }
+
+       if ( -d "$clientdir/cachedir" ) {
+               unlink <$clientdir/cachedir/*>;
+       } else {
+               mkdir("$clientdir/cachedir", 0777);
+       }
+
        # this is ugly, but the ncalrpcdir needs exactly 0755
        # otherwise tests fail.
        my $mask = umask;
@@ -627,6 +639,8 @@ sub write_clientconf($$$)
        print CF "
        private dir = $clientdir/private
        lock dir = $clientdir/lockdir
+       state dir = $clientdir/statedir
+       cache dir = $clientdir/cachedir
        ncalrpc dir = $clientdir/ncalrpcdir
        name resolve order = file bcast
        panic action = $RealBin/gdb_backtrace \%PID\%

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index f238e149d123d529a69a9d5fe34b6a2cbf9298fa..fd979db0b4fc6d6b4ea97d1ae39cb9249345947a 100644 (file)
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -510,6 +510,8 @@ sub provision_raw_prepare($$$$$$$$$$)
        $ctx->{privatedir} = "$prefix_abs/private";
        $ctx->{ncalrpcdir} = "$prefix_abs/ncalrpc";
        $ctx->{lockdir} = "$prefix_abs/lockdir";
+       $ctx->{statedir} = "$prefix_abs/statedir";
+       $ctx->{cachedir} = "$prefix_abs/cachedir";
        $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";
@@ -525,6 +527,8 @@ sub provision_raw_prepare($$$$$$$$$$)
        push(@{$ctx->{directories}}, $ctx->{etcdir});
        push(@{$ctx->{directories}}, $ctx->{piddir});
        push(@{$ctx->{directories}}, $ctx->{lockdir});
+       push(@{$ctx->{directories}}, $ctx->{statedir});
+       push(@{$ctx->{directories}}, $ctx->{cachedir});
 
        $ctx->{smb_conf_extra_options} = "";
 
@@ -593,6 +597,8 @@ sub provision_raw_step1($$)
        pid directory = $ctx->{piddir}
        ncalrpc dir = $ctx->{ncalrpcdir}
        lock dir = $ctx->{lockdir}
+       state dir = $ctx->{statedir}
+       cache dir = $ctx->{cachedir}
        winbindd socket directory = $ctx->{winbindd_socket_dir}
        winbindd privileged socket directory = $ctx->{winbindd_privileged_socket_dir}
        ntp signd socket directory = $ctx->{ntp_signd_socket_dir}
@@ -686,6 +692,8 @@ nogroup:x:65534:nobody
                WINBINDD_SOCKET_DIR => $ctx->{winbindd_socket_dir},
                NCALRPCDIR => $ctx->{ncalrpcdir},
                LOCKDIR => $ctx->{lockdir},
+               STATEDIR => $ctx->{statedir},
+               CACHEDIR => $ctx->{cachedir},
                SERVERCONFFILE => $ctx->{smb_conf},
                CONFIGURATION => $configuration,
                SOCKET_WRAPPER_DEFAULT_IFACE => $ctx->{swiface},