summaryrefslogtreecommitdiff
path: root/selftest
diff options
context:
space:
mode:
Diffstat (limited to 'selftest')
-rw-r--r--selftest/target/Samba3.pm6
-rw-r--r--selftest/wscript3
2 files changed, 8 insertions, 1 deletions
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 595780aa14..505130f596 100644
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -424,7 +424,11 @@ $ret->{USERNAME} = KTEST\\Administrator
#Samba4 DC with the same parameters as are being used here. The
#domain SID is S-1-5-21-1071277805-689288055-3486227160
- system("cp $self->{srcdir}/source3/selftest/ktest-secrets.tdb $prefix/private/secrets.tdb");
+ if (defined($ENV{BUILD_TDB2})) {
+ system("cp $self->{srcdir}/source3/selftest/ktest-secrets.tdb2 $prefix/private/secrets.tdb");
+ } else {
+ system("cp $self->{srcdir}/source3/selftest/ktest-secrets.tdb $prefix/private/secrets.tdb");
+ }
chmod 0600, "$prefix/private/secrets.tdb";
#This uses a pre-calculated krb5 credentials cache, obtained by running Samba4 with:
diff --git a/selftest/wscript b/selftest/wscript
index ab9f269b79..558cb2abd2 100644
--- a/selftest/wscript
+++ b/selftest/wscript
@@ -174,6 +174,9 @@ def cmd_testonly(opt):
if env.USING_SYSTEM_LDB:
os.environ['LDB_MODULES_PATH'] = 'bin/modules/ldb'
+ if env.BUILD_TDB2:
+ os.environ['BUILD_TDB2'] = '1'
+
# tell build system where to find config.h
os.environ['VFSLIBDIR'] = os.path.abspath('bin/modules/vfs')
os.environ['CONFIG_H'] = 'bin/default/include/config.h'