From 35817c01a87f4bda0f492144a56d39a99bc07eb1 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 22 Aug 2006 01:32:29 +0000
Subject: r17679: - fix 'make test-ldap' to skip ldb specials

- allow ldb to be built in a separate build directory, using:

     /some/path/to/ldb/configure
     make

  this will make it much easier to put ldb in the build farm without
  interfering with the build farm builds of tdb and talloc
(This used to be commit 580ed6730d33bad62e9799a38377c40f2852ae89)
---
 source4/lib/ldb/tests/test-ldap.sh | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'source4/lib/ldb/tests/test-ldap.sh')

diff --git a/source4/lib/ldb/tests/test-ldap.sh b/source4/lib/ldb/tests/test-ldap.sh
index d9fa73b641..592e09f408 100755
--- a/source4/lib/ldb/tests/test-ldap.sh
+++ b/source4/lib/ldb/tests/test-ldap.sh
@@ -24,17 +24,18 @@ for f in $SCHEMA_NEEDED; do
     fi
 done
 
-export LDB_URL=`tests/ldapi_url.sh`
-
-PATH=bin:$PATH
-export PATH
-
 if [ -z "$LDBDIR" ]; then
-    LDBDIR="."
+    LDBDIR=`dirname $0`/..
     export LDBDIR
 fi
 
+export LDB_URL=`$LDBDIR/tests/ldapi_url.sh`
+
+PATH=bin:$PATH
+export PATH
+
 . $LDBDIR/tests/init_slapd.sh
 . $LDBDIR/tests/start_slapd.sh
 
+export LDB_SPECIALS=0
 . $LDBDIR/tests/test-generic.sh
-- 
cgit