ldb: Support running testsuite without installing first.

diff --git a/source4/lib/ldb/Makefile.in b/source4/lib/ldb/Makefile.in
index 663dea9f807d5481692d229c0b15628fa180619c..c1f403d5500d6bb560cb67c3959d3756e12fbb20 100644 (file)
--- 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 4b73a455c9322fc1558f0fac64557f4ea1b511ff..e87db6457425382a41307621e5bbfda913b872fa 100644 (file)
--- 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)