diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-11-27 03:13:08 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-11-27 04:32:11 +0100 |
| commit | d237698850f00325346335b53cfe31657026b940 (patch) | |
| tree | ec1876ee92113c1fd542da62f94c44237a758466 | |
| parent | 3483adaf0a66ddda30c828a478b859bd8270a2e5 (diff) | |
| download | samba-d237698850f00325346335b53cfe31657026b940.tar.gz samba-d237698850f00325346335b53cfe31657026b940.tar.bz2 samba-d237698850f00325346335b53cfe31657026b940.zip | |
blackbox.ldb: Support using system ldbsearch.
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Sat Nov 27 04:32:11 CET 2010 on sn-devel-104
| -rwxr-xr-x | source4/selftest/tests.py | 4 | ||||
| -rwxr-xr-x | testprogs/blackbox/test_ldb.sh | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index bd743d285e..1d95ad2d9f 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -202,7 +202,9 @@ for t in smb4torture_testsuites("LDAP-"): ldbdir = os.path.join(samba4srcdir, "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", "TEST_DATA_PREFIX=$PREFIX %s/tests/test-tdb.sh" % ldbdir, allow_empty_output=True) + plantestsuite("ldb.base", "none", + "TEST_DATA_PREFIX=$PREFIX %s/tests/test-tdb.sh" % ldbdir, + allow_empty_output=True) else: skiptestsuite("ldb.base", "Using system LDB, ldbtest not available") diff --git a/testprogs/blackbox/test_ldb.sh b/testprogs/blackbox/test_ldb.sh index 9a4780f10b..78fd93cf8c 100755 --- a/testprogs/blackbox/test_ldb.sh +++ b/testprogs/blackbox/test_ldb.sh @@ -32,8 +32,9 @@ check() { return $status } +export PATH="$BUILDDIR/bin:$PATH" -ldbsearch="$VALGRIND $BUILDDIR/bin/ldbsearch$EXEEXT" +ldbsearch="$VALGRIND ldbsearch$EXEEXT" check "RootDSE" $ldbsearch $CONFIGURATION $options --basedn='' -H $p://$SERVER -s base DUMMY=x dnsHostName highestCommittedUSN || failed=`expr $failed + 1` |