selftest: Bring ldb test defintions into one place in selftest/tests.py

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>

diff --git a/selftest/tests.py b/selftest/tests.py
index d6eb69391b0ed8ca54fda35dc6654aae7351ab88..dfdc571be6252ebc1c2122a3c85e9230b01f6576 100644 (file)
--- a/selftest/tests.py
+++ b/selftest/tests.py
@@ -25,10 +25,10 @@ from selftesthelpers import plantestsuite, bbdir
 from selftesthelpers import configuration, valgrindify
 from selftesthelpers import skiptestsuite
 
+samba4bindir = bindir()
 try:
     config_h = os.environ["CONFIG_H"]
 except KeyError:
-    samba4bindir = bindir()
     config_h = os.path.join(samba4bindir, "default/include/config.h")
 
 # check available features
@@ -141,6 +141,10 @@ for ldb_test_exe in ldb_test_exes:
     plantestsuite(f"ldb.unittests.{ldb_test_exe}", "none",
                   [os.path.join(bindir(), f"default/lib/ldb/{ldb_test_exe}")])
 
+# Shell based LDB blackbox tests and the older ldbtest C tests
+ldbdir = os.path.join(srcdir(), "lib/ldb")
+plantestsuite("ldb.base", "none", "%s/tests/test-tdb-subunit.sh %s" % (ldbdir, samba4bindir))
+
 planpythontestsuite("none", "samba.tests.credentials")
 planpythontestsuite("none", "samba.tests.registry")
 planpythontestsuite("ad_dc_ntvfs:local", "samba.tests.auth")

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 7964f158ac5899d9365a05766a00d850f15f044d..222e60d9887ffeef199bae29b288417a34c2d1e6 100755 (executable)
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -202,9 +202,6 @@ for t in smbtorture4_testsuites("ldap."):
 for t in smbtorture4_testsuites("dsdb."):
     plansmbtorture4testsuite(t, "ad_dc:local", "localhost")
 
-ldbdir = os.path.join(srcdir(), "lib/ldb")
-plantestsuite("ldb.base", "none", "%s/tests/test-tdb-subunit.sh %s" % (ldbdir, samba4bindir))
-
 plantestsuite_loadlist("samba4.tests.attr_from_server.python(ad_dc_ntvfs)",
                        "ad_dc_ntvfs:local",
                        [python, os.path.join(DSDB_PYTEST_DIR, "attr_from_server.py"),