diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2014-06-23 16:31:25 +1000 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2014-06-24 09:37:39 +0200 |
| commit | d097898020c77c34c99cda17f386d445c7980bed (patch) | |
| tree | dc6ae3ee428010976c9c5cbf10944f71bb7bfe36 | |
| parent | e9006db3eb49ea07bde58ae9f8c5d70b4816589f (diff) | |
| download | samba-d097898020c77c34c99cda17f386d445c7980bed.tar.gz samba-d097898020c77c34c99cda17f386d445c7980bed.tar.xz samba-d097898020c77c34c99cda17f386d445c7980bed.zip | |
ctdb-build: Instead of default test_wrap, install fixed test_wrap
tests/scripts/test_wrap script is updated based on the configured paths.
This should be installed instead of the stock version in the source.
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): Tue Jun 24 09:37:39 CEST 2014 on sn-devel-104
| -rwxr-xr-x | ctdb/wscript | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/ctdb/wscript b/ctdb/wscript index 2ba82fc788..df7ce98a77 100755 --- a/ctdb/wscript +++ b/ctdb/wscript @@ -468,7 +468,6 @@ def build(bld): 'events.d', 'eventscripts', 'onnode', - 'scripts', 'simple', 'takeover', 'tool' @@ -480,12 +479,26 @@ def build(bld): bld.INSTALL_FILES(bld.env.CTDB_TEST_DATADIR, 'tests/%s' % fmode[0], destname=fmode[0], chmod=fmode[1]) + # Install tests/scripts directory without test_wrap + test_scripts = [ + 'common.sh', + 'integration.bash', + 'unit.sh' + ] + + for t in test_scripts: + bld.INSTALL_FILES(bld.env.CTDB_TEST_DATADIR, + os.path.join('tests/scripts', t), + destname=os.path.join('scripts', t)) + sed_expr = 's@^TEST_SCRIPTS_DIR=.*@&\\nexport TEST_BIN_DIR=\"%s\"@' % ( bld.env.CTDB_TEST_LIBDIR) bld.SAMBA_GENERATOR('ctdb-test-wrap', source='tests/scripts/test_wrap', target='test_wrap', rule='sed -e "%s" ${SRC} > ${TGT}' % sed_expr) + bld.INSTALL_FILES(bld.env.CTDB_TEST_DATADIR+"/scripts", 'test_wrap', + destname='test_wrap', chmod=0755) sed_expr1 = 's@^test_dir=.*@test_dir=%s\\nexport TEST_BIN_DIR=\"%s\"@' % ( bld.env.CTDB_TEST_DATADIR, bld.env.CTDB_TEST_LIBDIR) |