summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-04-04 18:52:25 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-04-10 16:57:06 +1000
commitc484f259c66ffcf0649dd5ab0d7c86e5c70d31af (patch)
tree776914f0ea58307c41d4734365d2f2a168f8f3aa /source4
parent57341c0f29911d09e511c840386a35290febb9f9 (diff)
downloadsamba-c484f259c66ffcf0649dd5ab0d7c86e5c70d31af.tar.gz
samba-c484f259c66ffcf0649dd5ab0d7c86e5c70d31af.tar.bz2
samba-c484f259c66ffcf0649dd5ab0d7c86e5c70d31af.zip
ldb: Detect failures in ldb.base again
We need to wrap the ldb tests in the subunit blackbox helpers. We also needed to change to the right directory, or else the :< file:// syntax check does not work, as samba4.png is not found. Andrew Bartlett
Diffstat (limited to 'source4')
-rwxr-xr-xsource4/selftest/tests.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index f08417454a..8279ba4041 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -92,8 +92,7 @@ for t in smb4torture_testsuites("ldap."):
ldbdir = os.path.join(srcdir(), "lib/ldb")
# Don't run LDB tests when using system ldb, as we won't have ldbtest installed
if os.path.exists(os.path.join(samba4bindir, "ldbtest")):
- plantestsuite("ldb.base", "none", "%s/tests/test-tdb.sh" % ldbdir,
- allow_empty_output=True)
+ plantestsuite("ldb.base", "none", "%s/tests/test-tdb-subunit.sh %s" % (ldbdir, samba4bindir))
else:
skiptestsuite("ldb.base", "Using system LDB, ldbtest not available")