summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-11-03 14:26:04 +1100
committerAndrew Tridgell <tridge@samba.org>2010-11-03 04:13:22 +0000
commitb028f55880f5beedb9acb440d4ea53b54345870b (patch)
tree7c7402eaa508702bed6882342fd3dc7a98bd5040
parentef1afae2cec531797750be32907705566aa2d228 (diff)
downloadsamba-b028f55880f5beedb9acb440d4ea53b54345870b.tar.gz
samba-b028f55880f5beedb9acb440d4ea53b54345870b.tar.bz2
samba-b028f55880f5beedb9acb440d4ea53b54345870b.zip
s4-test: if using a system version of ldb, override the ldb modules path
Autobuild-User: Andrew Tridgell <tridge@samba.org> Autobuild-Date: Wed Nov 3 04:13:22 UTC 2010 on sn-devel-104
-rw-r--r--source4/selftest/wscript5
1 files changed, 5 insertions, 0 deletions
diff --git a/source4/selftest/wscript b/source4/selftest/wscript
index 2f4e4362e0..2273def930 100644
--- a/source4/selftest/wscript
+++ b/source4/selftest/wscript
@@ -141,6 +141,11 @@ def cmd_testonly(opt):
# this is needed for systems without rpath, or with rpath disabled
ADD_LD_LIBRARY_PATH('bin/shared')
+ # if we are using a system version of ldb then we need to tell it to
+ # load modules from our modules path
+ if env.USING_SYSTEM_LDB:
+ os.environ['LDB_MODULES_PATH'] = 'bin/modules/ldb'
+
# tell build system where to find config.h
os.environ['CONFIG_H'] = 'bin/default/source4/include/config.h'