From df65fc02fb6684d86271c89a21f297fd29b8539c Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 11 Sep 2009 23:49:36 +0200
Subject: ldb: Support running testsuite without installing first.

---
 source4/lib/ldb/Makefile.in | 5 +++--
 source4/lib/ldb/ldb.mk      | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'source4/lib')

diff --git a/source4/lib/ldb/Makefile.in b/source4/lib/ldb/Makefile.in
index 663dea9f80..c1f403d550 100644
--- a/source4/lib/ldb/Makefile.in
+++ b/source4/lib/ldb/Makefile.in
@@ -23,6 +23,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PYTHON = @PYTHON@
 PYTHON_CONFIG = @PYTHON_CONFIG@
 ldbdir = $(srcdir)
+LIB_PATH_VAR = @LIB_PATH_VAR@
 
 LDB_MODULESDIR = @LDB_MODULESDIR@
 
@@ -146,10 +147,10 @@ realdistclean:: distclean
 check:: test @PYTHON_CHECK_TARGET@
 
 check-soloading: sample.$(SHLIBEXT)
-	LDB_MODULES_PATH=$(builddir) $(srcdir)/tests/test-soloading.sh
+	$(LIB_PATH_VAR)=lib LDB_MODULES_PATH=$(builddir) $(srcdir)/tests/test-soloading.sh
 
 test:: all check-soloading
-	for t in $(TESTS); do echo STARTING $${t}; $(srcdir)/tests/$${t} || exit 1; done
+	for t in $(TESTS); do echo STARTING $${t}; $(LIB_PATH_VAR)=lib $(srcdir)/tests/$${t} || exit 1; done
 
 valgrindtest:: all
 	for t in $(TESTS); do echo STARTING $${t}; VALGRIND="valgrind -q --db-attach=yes --num-callers=30" $(srcdir)/tests/$${t} || exit 1; done
diff --git a/source4/lib/ldb/ldb.mk b/source4/lib/ldb/ldb.mk
index 4b73a455c9..e87db64574 100644
--- a/source4/lib/ldb/ldb.mk
+++ b/source4/lib/ldb/ldb.mk
@@ -74,8 +74,8 @@ install-python:: build-python
 	mkdir -p $(DESTDIR)`$(PYTHON) -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1, prefix='$(prefix)')"`
 	cp ldb.$(SHLIBEXT) $(DESTDIR)`$(PYTHON) -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1, prefix='$(prefix)')"`
 
-check-python:: build-python
-	LD_LIBRARY_PATH=lib PYTHONPATH=.:$(ldbdir) $(PYTHON) $(ldbdir)/tests/python/api.py
+check-python:: build-python lib/$(SONAME)
+	$(LIB_PATH_VAR)=lib PYTHONPATH=.:$(ldbdir) $(PYTHON) $(ldbdir)/tests/python/api.py
 
 clean::
 	rm -f ldb.$(SHLIBEXT)
-- 
cgit