Fix 'make gdbtest-enb' and the GDB_PROVISION option.

[kai/samba.git] / source4 / selftest / target / Samba4.pm

diff --git a/source4/selftest/target/Samba4.pm b/source4/selftest/target/Samba4.pm
index 069aff73cfb013f00b743cf7167a3ec967449015..2347dfc742b78622984d548e457180f44539dcdd 100644 (file)
--- a/source4/selftest/target/Samba4.pm
+++ b/source4/selftest/target/Samba4.pm
@@ -520,7 +520,9 @@ sub provision($$$$$$)
        my $privatedir = "$prefix_abs/private";
        my $ncalrpcdir = "$prefix_abs/ncalrpc";
        my $lockdir = "$prefix_abs/lockdir";
-       my $winbindd_socket_dir = "$prefix_abs/winbind_socket";
+       my $winbindd_socket_dir = "$prefix_abs/winbindd_socket";
+       my $winbindd_privileged_socket_dir = "$prefix_abs/winbindd_privileged_socket";
+       my $ntp_signd_socket_dir = "$prefix_abs/ntp_signd_socket";
        my $winbindd_priv_pipe_dir = "$privatedir/smbd.tmp/winbind_pipe";
        my $nsswrap_passwd = "$etcdir/passwd";
        my $nsswrap_group = "$etcdir/group";
@@ -556,6 +558,8 @@ sub provision($$$$$$)
        modules dir = $self->{bindir}/modules
        js include = $srcdir/scripting/libjs
        winbindd socket directory = $winbindd_socket_dir
+       winbindd privileged socket directory = $winbindd_privileged_socket_dir
+       ntp signd socket directory = $ntp_signd_socket_dir
         winbind separator = /
        name resolve order = bcast
        interfaces = $interfaces
@@ -579,6 +583,7 @@ sub provision($$$$$$)
        posix:sharedelay = 100000
        posix:eadb = $lockdir/eadb.tdb
        posix:oplocktimeout = 3
+       posix:writetimeupdatedelay = 500000
 
 [test1]
        path = $tmpdir/test1
@@ -587,6 +592,7 @@ sub provision($$$$$$)
        posix:sharedelay = 100000
        posix:eadb = $lockdir/eadb.tdb
        posix:oplocktimeout = 3
+       posix:writetimeupdatedelay = 500000
 
 [test2]
        path = $tmpdir/test2
@@ -595,6 +601,7 @@ sub provision($$$$$$)
        posix:sharedelay = 100000
        posix:eadb = $lockdir/eadb.tdb
        posix:oplocktimeout = 3
+       posix:writetimeupdatedelay = 500000
 
 [cifs]
        read only = no
@@ -695,13 +702,13 @@ nogroup:x:65534:nobody
        my @provision_options = ();
        push (@provision_options, "NSS_WRAPPER_PASSWD=\"$nsswrap_passwd\"");
        push (@provision_options, "NSS_WRAPPER_GROUP=\"$nsswrap_group\"");
-       if (defined($ENV{PROVISION_EJS})) {
-               push (@provision_options, "$self->{bindir}/smbscript");
-               push (@provision_options, "$self->{setupdir}/provision.js");
-       } else {
-               push (@provision_options, "$self->{bindir}/smbpython");
-               push (@provision_options, "$self->{setupdir}/provision");
+       if (defined($ENV{GDB_PROVISION})) {
+               push (@provision_options, "gdb --args python");
+       }
+       if (defined($ENV{VALGRIND_PROVISION})) {
+               push (@provision_options, "valgrind");
        }
+       push (@provision_options, "$self->{setupdir}/provision");
        push (@provision_options, split(' ', $configuration));
        push (@provision_options, "--host-name=$netbiosname");
        push (@provision_options, "--host-ip=$ifaceipv4");
@@ -746,7 +753,7 @@ nogroup:x:65534:nobody
        if (defined($self->{ldap})) {
 
                 push (@provision_options, "--ldap-backend=$ldap_uri");
-               system("$self->{bindir}/smbpython $self->{setupdir}/provision-backend $configuration --ldap-manager-pass=$password --root=$unix_name --realm=$realm --domain=$domain --host-name=$netbiosname --ldap-backend-type=$self->{ldap}>&2") == 0 or die("backend provision failed");
+               system("$self->{setupdir}/provision-backend $configuration --ldap-manager-pass=$password --root=$unix_name --realm=$realm --domain=$domain --host-name=$netbiosname --ldap-backend-type=$self->{ldap}>&2") == 0 or die("backend provision failed");
 
                if ($self->{ldap} eq "openldap") {
                       ($ret->{SLAPD_CONF}, $ret->{OPENLDAP_PIDFILE}) = $self->mk_openldap($ldapdir, $configuration) or die("Unable to create openldap directories");