Attachment 12903 Details for Bug 12547 – Patches for v4-6

[patch] Patches for v4-6

BZ12547-v4-6.patch (text/plain), 1.25 KB, created by Amitay Isaacs on 2017-02-03 00:14:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Amitay Isaacs

Created: 2017-02-03 00:14:19 UTC

Size: 1.25 KB

patch

obsolete

>From 1bef67680d2f6f2adce5b27e0500f02d9da52756 Mon Sep 17 00:00:00 2001
>From: Amitay Isaacs <amitay@gmail.com>
>Date: Wed, 1 Feb 2017 15:53:47 +1100
>Subject: [PATCH] ctdb-build: Install CTDB tests correctly from toplevel
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=12547
>
>Signed-off-by: Amitay Isaacs <amitay@gmail.com>
>Reviewed-by: Martin Schwenke <martin@meltin.net>
>
>Autobuild-User(master): Martin Schwenke <martins@samba.org>
>Autobuild-Date(master): Thu Feb  2 08:25:57 CET 2017 on sn-devel-144
>
>(cherry picked from commit ce9b72c17abb156de8185b100f27d1ddd3c89b15)
>---
> ctdb/wscript | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
>diff --git a/ctdb/wscript b/ctdb/wscript
>index 446bd8d..13384c8 100644
>--- a/ctdb/wscript
>+++ b/ctdb/wscript
>@@ -850,8 +850,13 @@ def build(bld):
>         'tool'
>     ]
> 
>+    if bld.env.standalone_ctdb:
>+        testdir = 'tests'
>+    else:
>+        testdir = 'ctdb/tests'
>+
>     for t in test_subdirs:
>-        files = SUBDIR_MODE('tests/%s' % t, trim_path='tests')
>+        files = SUBDIR_MODE('%s/%s' % (testdir, t), trim_path=testdir)
>         for fmode in files:
>             bld.INSTALL_FILES(bld.env.CTDB_TEST_DATADIR, 'tests/%s' % fmode[0],
>                               destname=fmode[0], chmod=fmode[1])
>-- 
>2.9.3
>

Flags:

martins: review+

Actions: View

Attachments on bug 12547: 12902 | 12903