selftest: add "member" environment for Samba3

[metze/samba/wip.git] / selftest / selftest.pl

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 6f0883c585e296317eb66e27bf2316023f7b77a3..97cf6971790385dfc7b3967c2808f56cf0b16748 100755 (executable)
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -457,7 +457,7 @@ if ($opt_target eq "samba4") {
        if ($opt_socket_wrapper and `$bindir/smbd -b | grep SOCKET_WRAPPER` eq "") {
                die("You must include --enable-socket-wrapper when compiling Samba in order to execute 'make test'.  Exiting....");
        }
-       $testenv_default = "dc";
+       $testenv_default = "member";
        require target::Samba3;
        $target = new Samba3($bindir);
 } elsif ($opt_target eq "win") {
@@ -552,6 +552,12 @@ sub write_clientconf($$)
                mkdir("$prefix/client/private", 0777);
        }
 
+       if ( -d "$prefix/client/lock" ) {
+               unlink <$prefix/client/lockdir/*>;
+       } else {
+               mkdir("$prefix/client/lockdir", 0777);
+       }
+
        open(CF, ">$conffile");
        print CF "[global]\n";
        if (defined($ENV{VALGRIND})) {
@@ -574,12 +580,14 @@ sub write_clientconf($$)
        }
        if (defined($vars->{WINBINDD_SOCKET_DIR})) {
                print CF "\twinbindd socket directory = $vars->{WINBINDD_SOCKET_DIR}\n";
+               print CF "\twinbindd:socket dir = $vars->{WINBINDD_SOCKET_DIR}\n";
        }
        if ($opt_socket_wrapper) {
                print CF "\tinterfaces = $interfaces\n";
        }
        print CF "
        private dir = $prefix_abs/client/private
+       lock dir = $prefix_abs/client/lockdir
        name resolve order = bcast
        panic action = $RealBin/gdb_backtrace \%PID\% \%PROG\%
        max xmit = 32K