From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 27 Nov 2010 02:13:08 +0000 (+0100)
Subject: blackbox.ldb: Support using system ldbsearch.
X-Git-Tag: samba-4.0.0alpha14~768
X-Git-Url: http://git.samba.org/samba.git/?p=ira%2Fwip.git;a=commitdiff_plain;h=d237698850f00325346335b53cfe31657026b940

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
---

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index bd743d285e7..1d95ad2d9fc 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 9a4780f10b8..78fd93cf8c3 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`