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 bd743d285e78c02cb05c8436cf476234f30a74c1..1d95ad2d9fc8e6889c763670dd32d3a0bfa7c6a3 100755 (executable)
--- 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 9a4780f10b866b22409af81bfeb9bffdafe1eb86..78fd93cf8c321ee53b1726519a815f0ad4fde258 100755 (executable)
--- 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`