diff options
| author | Andrew Tridgell <tridge@samba.org> | 2006-08-22 01:32:29 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:16:22 -0500 |
| commit | 35817c01a87f4bda0f492144a56d39a99bc07eb1 (patch) | |
| tree | 6495a245745b48a3b9fffb13934a0681aacfae1d /source4/lib/ldb/tests/test-ldap.sh | |
| parent | 862ba2617205832d4d5f0db07c54c4cc436a0f3d (diff) | |
| download | samba-35817c01a87f4bda0f492144a56d39a99bc07eb1.tar.gz samba-35817c01a87f4bda0f492144a56d39a99bc07eb1.tar.bz2 samba-35817c01a87f4bda0f492144a56d39a99bc07eb1.zip | |
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)
Diffstat (limited to 'source4/lib/ldb/tests/test-ldap.sh')
| -rwxr-xr-x | source4/lib/ldb/tests/test-ldap.sh | 13 |
1 files changed, 7 insertions, 6 deletions
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 |