diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2011-06-20 18:40:33 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2011-06-20 11:18:36 +0200 |
| commit | 5eecc854236f0b943aaa89e0c3a46f9fbd208ca9 (patch) | |
| tree | 89ae34b70f5a32f22b301ec9e4db363e046737cd /selftest | |
| parent | 957801fcb0c81317c84d448f1e04d069216f07ac (diff) | |
| download | samba-5eecc854236f0b943aaa89e0c3a46f9fbd208ca9.tar.gz samba-5eecc854236f0b943aaa89e0c3a46f9fbd208ca9.tar.bz2 samba-5eecc854236f0b943aaa89e0c3a46f9fbd208ca9.zip | |
tdb2: create tdb2 versions of various testing TDBs.
Soon, TDB2 will handle tdb1 files, but until then, we substitute.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'selftest')
| -rw-r--r-- | selftest/target/Samba3.pm | 6 | ||||
| -rw-r--r-- | selftest/wscript | 3 |
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' |