selftest:Samba4: test --domain-critical-only in provision_vampire_dc()
[ira/wip.git] / selftest / wscript
index 5ba1c531d5d67935d9f820a2e2d73a7382224a51..558cb2abd2ed9d35aea5a6e37b3c843b6938b820 100644 (file)
@@ -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'
@@ -187,10 +190,8 @@ def cmd_testonly(opt):
 
     if Options.options.TARGET:
         env.SELFTEST_TARGET = Options.options.TARGET
-    elif env.enable_s3build:
-        env.SELFTEST_TARGET = "samba"
     else:
-        env.SELFTEST_TARGET = "samba4"
+        env.SELFTEST_TARGET = "samba"
 
     if env.SELFTEST_TARGET == "samba4":
         env.SELFTEST_DIR = "${srcdir}/source4/selftest"
@@ -203,7 +204,7 @@ def cmd_testonly(opt):
                           env.srcdir + "/source3/selftest/" + f,
                           env.SELFTEST_PREFIX + "/" + f)
 
-        env.SELFTEST_DIR = "${srcdir}/st"
+        env.SELFTEST_DIR = env.SELFTEST_PREFIX
         env.TESTLISTS = ('--testlist="${PYTHON} ${srcdir}/source3/selftest/tests.py|" ' +
                          '--testlist="${PYTHON} ${srcdir}/source4/selftest/tests.py|"')
     else: