From: Michael Adam <obnox@samba.org>
Date: Tue, 21 Jun 2016 07:50:53 +0000 (+0200)
Subject: ctdb: fix autotest with socket-wrapper installed in the system
X-Git-Tag: tdb-1.3.10~430
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2f95ada1494b19eec02e86eaf3f9270fa8b08318;p=thirdparty%2Fsamba.git

ctdb: fix autotest with socket-wrapper installed in the system

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

Autobuild-User(master): Amitay Isaacs <amitay@samba.org>
Autobuild-Date(master): Mon Jul 11 15:53:30 CEST 2016 on sn-devel-144
---

diff --git a/ctdb/wscript b/ctdb/wscript
index 3eae06653dd..f3a1901c322 100755
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -107,6 +107,7 @@ def configure(conf):
     conf.RECURSE('lib/tdb')
     if conf.env.standalone_ctdb or conf.CONFIG_GET('ENABLE_SELFTEST'):
         conf.RECURSE('lib/socket_wrapper')
+        conf.env.SOCKET_WRAPPER_SO_PATH = conf.CONFIG_GET('LIBSOCKET_WRAPPER_SO_PATH')
 
     conf.CHECK_HEADERS('sched.h')
     conf.CHECK_HEADERS('procinfo.h')
@@ -816,7 +817,8 @@ def test(ctx):
 
 
 def autotest(ctx):
-    ld = 'LD_PRELOAD=%s/bin/shared/libsocket-wrapper.so' % os.getcwd()
+    env = samba_utils.LOAD_ENVIRONMENT()
+    ld = 'LD_PRELOAD=%s' % env.SOCKET_WRAPPER_SO_PATH
     cmd = '%s tests/run_tests.sh -e -S -C' % ld
     ret = samba_utils.RUN_COMMAND(cmd)
     if ret != 0: