From d04e4a682a3b9d78b7298e379668d7f19a63ca73 Mon Sep 17 00:00:00 2001 From: Amitay Isaacs 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 Reviewed-by: Martin Schwenke Autobuild-User(master): Martin Schwenke 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 4b58d2f..debfacc 100644 --- a/ctdb/wscript +++ b/ctdb/wscript @@ -768,8 +768,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