summaryrefslogtreecommitdiffstats
path: root/ctdb
diff options
context:
space:
mode:
authorAmitay Isaacs <amitay@gmail.com>2015-03-04 15:55:15 +1100
committerAmitay Isaacs <amitay@samba.org>2015-03-04 13:11:53 +0100
commit7a10e077706efd3b5d2ce024084b7ed97d4cd36c (patch)
tree34da55dde179d04a04b4a633ab034d35f4bf1654 /ctdb
parenta7dcc187e762b4f07e0233504a97aac816b04799 (diff)
downloadsamba-7a10e077706efd3b5d2ce024084b7ed97d4cd36c.tar.gz
samba-7a10e077706efd3b5d2ce024084b7ed97d4cd36c.tar.xz
samba-7a10e077706efd3b5d2ce024084b7ed97d4cd36c.zip
ctdb-build: Specify absolute path to libsocket-wrapper.so
Specifying a relative path to LD_PRELOAD can fail if any of the test scripts uses cd to change directory and execute commands. Adding statd-callout tests breaks autotest since statd-callout does "cd". Signed-off-by: Amitay Isaacs <amitay@gmail.com> Reviewed-by: Martin Schwenke <martin@meltin.net> Autobuild-User(master): Amitay Isaacs <amitay@samba.org> Autobuild-Date(master): Wed Mar 4 13:11:53 CET 2015 on sn-devel-104
Diffstat (limited to 'ctdb')
-rwxr-xr-xctdb/wscript3
1 files changed, 2 insertions, 1 deletions
diff --git a/ctdb/wscript b/ctdb/wscript
index 07651f1c7c..5957f16d51 100755
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -654,7 +654,8 @@ def test(ctx):
def autotest(ctx):
- cmd = 'LD_PRELOAD=bin/shared/libsocket-wrapper.so tests/run_tests.sh -e -S -C'
+ ld = 'LD_PRELOAD=%s/bin/shared/libsocket-wrapper.so' % os.getcwd()
+ cmd = '%s tests/run_tests.sh -e -S -C' % ld
ret = samba_utils.RUN_COMMAND(cmd)
if ret != 0:
print('autotest exited with exit status %d' % ret)