diff options
| -rwxr-xr-x | lib/ldb/tests/test-tdb-subunit.sh | 7 | ||||
| -rwxr-xr-x | lib/ldb/tests/test-tdb.sh | 10 | ||||
| -rwxr-xr-x | lib/ldb/wscript | 2 | ||||
| -rwxr-xr-x | source4/selftest/tests.py | 3 |
4 files changed, 16 insertions, 6 deletions
diff --git a/lib/ldb/tests/test-tdb-subunit.sh b/lib/ldb/tests/test-tdb-subunit.sh new file mode 100755 index 0000000000..7dab79f7ba --- /dev/null +++ b/lib/ldb/tests/test-tdb-subunit.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +BINDIR=$1 + +. `dirname $0`/../../../testprogs/blackbox/subunit.sh + +testit "ldb" `dirname $0`/test-tdb.sh $BINDIR diff --git a/lib/ldb/tests/test-tdb.sh b/lib/ldb/tests/test-tdb.sh index c2285a93f1..3310c81392 100755 --- a/lib/ldb/tests/test-tdb.sh +++ b/lib/ldb/tests/test-tdb.sh @@ -1,5 +1,7 @@ #!/bin/sh +BINDIR=$1 + if [ -n "$TEST_DATA_PREFIX" ]; then LDB_URL="$TEST_DATA_PREFIX/tdbtest.ldb" else @@ -7,16 +9,18 @@ else fi export LDB_URL -PATH=bin:$PATH +PATH=$BINDIR:$PATH export PATH -rm -f $LDB_URL* - if [ -z "$LDBDIR" ]; then LDBDIR=`dirname $0`/.. export LDBDIR fi +cd $LDBDIR + +rm -f $LDB_URL* + cat <<EOF | $VALGRIND ldbadd || exit 1 dn: @MODULES @LIST: rdn_name diff --git a/lib/ldb/wscript b/lib/ldb/wscript index f297e9af94..b2a23bfb17 100755 --- a/lib/ldb/wscript +++ b/lib/ldb/wscript @@ -271,7 +271,7 @@ def test(ctx): shutil.rmtree(test_prefix, ignore_errors=True) os.makedirs(test_prefix) os.environ['TEST_DATA_PREFIX'] = test_prefix - cmd = 'tests/test-tdb.sh' + cmd = 'tests/test-tdb.sh %s' % Utils.g_module.blddir ret = samba_utils.RUN_COMMAND(cmd) print("testsuite returned %d" % ret) # FIXME: Run python testsuite 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") |