selftest: Run ad_dc and vampire_dc with --backend-store=mdb
authorAndrew Bartlett <abartlet@samba.org>
Mon, 14 May 2018 00:14:06 +0000 (12:14 +1200)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 23 May 2018 00:27:12 +0000 (02:27 +0200)
This ensures the LMDB backend is tested in make test

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
selftest/target/Samba4.pm

index 5353779292ed080cc8091cc2482b4ee8e110aaaf..14e312f858647369491e16cda93f4e61e798b41a 100755 (executable)
@@ -1403,6 +1403,7 @@ sub provision_vampire_dc($$$)
        $cmd .= "$samba_tool domain join $ret->{CONFIGURATION} $dcvars->{REALM} DC --realm=$dcvars->{REALM}";
        $cmd .= " -U$dcvars->{DC_USERNAME}\%$dcvars->{DC_PASSWORD} --domain-critical-only";
        $cmd .= " --machinepass=machine$ret->{PASSWORD} --use-ntvfs";
        $cmd .= "$samba_tool domain join $ret->{CONFIGURATION} $dcvars->{REALM} DC --realm=$dcvars->{REALM}";
        $cmd .= " -U$dcvars->{DC_USERNAME}\%$dcvars->{DC_PASSWORD} --domain-critical-only";
        $cmd .= " --machinepass=machine$ret->{PASSWORD} --use-ntvfs";
+       $cmd .= " --backend-store=mdb";
 
        unless (system($cmd) == 0) {
                warn("Join failed\n$cmd");
 
        unless (system($cmd) == 0) {
                warn("Join failed\n$cmd");
@@ -1937,6 +1938,8 @@ sub provision_ad_dc($$$$$$)
        copy = print1
 ";
 
        copy = print1
 ";
 
+       my $extra_provision_options = undef;
+       push (@{$extra_provision_options}, "--backend-store=mdb");
        print "PROVISIONING AD DC...\n";
        my $ret = $self->provision($prefix,
                                   "domain controller",
        print "PROVISIONING AD DC...\n";
        my $ret = $self->provision($prefix,
                                   "domain controller",
@@ -1949,7 +1952,7 @@ sub provision_ad_dc($$$$$$)
                                   undef,
                                   $extra_smbconf_options,
                                   $extra_smbconf_shares,
                                   undef,
                                   $extra_smbconf_options,
                                   $extra_smbconf_shares,
-                                  undef);
+                                  $extra_provision_options);
        unless (defined $ret) {
                return undef;
        }
        unless (defined $ret) {
                return undef;
        }