From: Amitay Isaacs <amitay@gmail.com>
Date: Wed, 1 Feb 2017 04:53:47 +0000 (+1100)
Subject: ctdb-build: Install CTDB tests correctly from toplevel
X-Git-Tag: talloc-2.1.9~280
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce9b72c17abb156de8185b100f27d1ddd3c89b15;p=thirdparty%2Fsamba.git

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
---

diff --git a/ctdb/wscript b/ctdb/wscript
index 446bd8d3529..13384c81b9a 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])