Attachment 10974 Details for Bug 11204 – additional patch for v4-2-test

[patch] additional patch for v4-2-test

patch-11204-v4-2-test (text/plain), 1.33 KB, created by Michael Adam on 2015-04-21 22:25:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Adam

Created: 2015-04-21 22:25:52 UTC

Size: 1.33 KB

patch

obsolete

>From 9fa9b2382c0239787845f0df1c416046f99c6011 Mon Sep 17 00:00:00 2001
>From: Amitay Isaacs <amitay@gmail.com>
>Date: Wed, 4 Mar 2015 15:55:15 +1100
>Subject: [PATCH] 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".
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=11204
>
>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
>(cherry picked from commit 7a10e077706efd3b5d2ce024084b7ed97d4cd36c)
>---
> ctdb/wscript |    3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
>diff --git a/ctdb/wscript b/ctdb/wscript
>index 281b735..104fc9a 100755
>--- a/ctdb/wscript
>+++ b/ctdb/wscript
>@@ -649,7 +649,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)
>-- 
>1.7.0.4
>

Flags:

obnox: review+
amitay: review+

Actions: View

Attachments on bug 11204: 10940 | 10974