selftest: add dbwrap_tdb_require_mutexes:* = yes, when using dbwrap_tdb_mutexes:...

export SELFTEST_DONT_REQUIRE_TDB_MUTEX_SUPPORT=1 can overwrite this.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Autobuild-User(master): Ralph Böhme <slow@samba.org>
Autobuild-Date(master): Tue Feb  9 01:42:14 CET 2016 on sn-devel-144

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 076bcb166f144a6c5394b0f384ab617f6c392b50..cb9ee08d822379f54db86be8259619581cd0e96c 100755 (executable)
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -308,10 +308,14 @@ sub setup_nt4_member($$$)
 
        print "PROVISIONING MEMBER...";
 
+       my $require_mutexes = "dbwrap_tdb_require_mutexes:* = yes";
+       $require_mutexes = "" if ($ENV{SELFTEST_DONT_REQUIRE_TDB_MUTEX_SUPPORT} eq "1");
+
        my $member_options = "
        security = domain
        server signing = on
        dbwrap_tdb_mutexes:* = yes
+       ${require_mutexes}
 ";
        my $ret = $self->provision($prefix,
                                   "LOCALNT4MEMBER3",

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index fbefda7fb640303dd245ac4abe09f4ce101d9028..2343cec186d0369a64835340f9ccf0d73707c099 100755 (executable)
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -1794,11 +1794,15 @@ sub provision_ad_dc($$)
        my $lockdir="$prefix_abs/lockdir";
         my $conffile="$prefix_abs/etc/smb.conf";
 
+       my $require_mutexes = "dbwrap_tdb_require_mutexes:* = yes";
+       $require_mutexes = "" if ($ENV{SELFTEST_DONT_REQUIRE_TDB_MUTEX_SUPPORT} eq "1");
+
        my $extra_smbconf_options = "
         server services = -smb +s3fs
         xattr_tdb:file = $prefix_abs/statedir/xattr.tdb
 
        dbwrap_tdb_mutexes:* = yes
+       ${require_mutexes}
 
        kernel oplocks = no
        kernel change notify = no