summaryrefslogtreecommitdiff
path: root/ctdb
diff options
context:
space:
mode:
authorAmitay Isaacs <amitay@gmail.com>2017-02-01 15:53:47 +1100
committerMartin Schwenke <martins@samba.org>2017-02-02 08:25:57 +0100
commitce9b72c17abb156de8185b100f27d1ddd3c89b15 (patch)
treedf4c9810751b19897134ba2947814d9307c78bbd /ctdb
parenta24ba3e4083200ec9885363efc5769f43183fb6b (diff)
downloadsamba-ce9b72c17abb156de8185b100f27d1ddd3c89b15.tar.gz
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
Diffstat (limited to 'ctdb')
-rw-r--r--ctdb/wscript7
1 files changed, 6 insertions, 1 deletions
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])