sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00
Code

ctdb-waf: Move ctdb tests to libexec directory

Browse Source 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12104

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Martin Schwenke <martin@meltin.net>
This commit is contained in:
Andreas Schneider 2016-08-03 13:23:31 +02:00 committed by Michael Adam
parent 976be8fe39
commit f9c85d04e9
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ctdb/wscript
View File

@ -210,7 +210,7 @@ def configure(conf):
conf.env.CTDB_TEST_DATADIR = os.path.join(conf.env.EXEC_PREFIX,
'share/ctdb-tests')
conf.env.CTDB_TEST_LIBDIR = os.path.join(conf.env.LIBDIR, 'ctdb-tests')
conf.env.CTDB_TEST_LIBEXECDIR = os.path.join(conf.env.LIBEXECDIR, 'ctdb/tests')
# Allow unified compilation and separate compilation of utilities
# to find includes
@ -666,27 +666,27 @@ def build(bld):
source=src,
deps='''talloc tevent tdb tevent-util
LIBASYNC_REQ samba-util''',
install_path='${CTDB_TEST_LIBDIR}')
install_path='${CTDB_TEST_LIBEXECDIR}')
bld.SAMBA_BINARY('reqid_test',
source='tests/src/reqid_test.c',
deps='samba-util',
install_path='${CTDB_TEST_LIBDIR}')
install_path='${CTDB_TEST_LIBEXECDIR}')
bld.SAMBA_BINARY('rb_test',
source='tests/src/rb_test.c',
deps='samba-util talloc',
install_path='${CTDB_TEST_LIBDIR}')
install_path='${CTDB_TEST_LIBEXECDIR}')
bld.SAMBA_BINARY('ctdb_packet_parse',
source='tests/src/ctdb_packet_parse.c',
deps='talloc tevent tdb ctdb-protocol',
install_path='${CTDB_TEST_LIBDIR}')
install_path='${CTDB_TEST_LIBEXECDIR}')
bld.SAMBA_BINARY('porting_tests',
source='tests/src/porting_tests.c',
deps='samba-util ctdb-system popt',
install_path='${CTDB_TEST_LIBDIR}')
install_path='${CTDB_TEST_LIBEXECDIR}')
bld.SAMBA_SUBSYSTEM('ctdb-tests-common',
@ -717,7 +717,7 @@ def build(bld):
includes='include',
deps='''ctdb-client2 ctdb-protocol ctdb-util
samba-util ctdb-tests-common''',
install_path='${CTDB_TEST_LIBDIR}')
install_path='${CTDB_TEST_LIBEXECDIR}')
bld.SAMBA_BINARY('ctdb_takeover_tests',
source='tests/src/ctdb_takeover_tests.c',
@ -725,13 +725,13 @@ def build(bld):
samba-util tdb-wrap talloc_report
ctdb-ipalloc ctdb-protocol ctdb-util''',
includes='include',
install_path='${CTDB_TEST_LIBDIR}')
install_path='${CTDB_TEST_LIBEXECDIR}')
bld.SAMBA_BINARY('fake_ctdbd',
source='tests/src/fake_ctdbd.c',
deps='''ctdb-util ctdb-protocol ctdb-system
samba-util tevent-util LIBASYNC_REQ popt''',
install_path='${CTDB_TEST_LIBDIR}')
install_path='${CTDB_TEST_LIBEXECDIR}')
if bld.env.HAVE_INFINIBAND:
bld.SAMBA_BINARY('ibwrapper_test',
@ -739,7 +739,7 @@ def build(bld):
includes='include',
deps='replace talloc ctdb-client ctdb-common' +
ib_deps,
install_path='${CTDB_TEST_LIBDIR}')
install_path='${CTDB_TEST_LIBEXECDIR}')
test_subdirs = [
'complex',
@ -772,7 +772,7 @@ def build(bld):
destname=os.path.join('scripts', t))
sed_expr = 's@^TEST_SCRIPTS_DIR=.*@&\\nexport TEST_BIN_DIR=\"%s\"@' % (
bld.env.CTDB_TEST_LIBDIR)
bld.env.CTDB_TEST_LIBEXECDIR)
bld.SAMBA_GENERATOR('ctdb-test-wrap',
source='tests/scripts/test_wrap',
target='test_wrap',
@ -789,7 +789,7 @@ def build(bld):
destname='script_install_paths.sh', chmod=0644)
sed_expr1 = 's@^test_dir=.*@test_dir=%s\\nexport TEST_BIN_DIR=\"%s\"@' % (
bld.env.CTDB_TEST_DATADIR, bld.env.CTDB_TEST_LIBDIR)
bld.env.CTDB_TEST_DATADIR, bld.env.CTDB_TEST_LIBEXECDIR)
sed_expr2 = 's@^\(export CTDB_TESTS_ARE_INSTALLED\)=false@\\1=true@'
bld.SAMBA_GENERATOR('ctdb-test-runner',
source='tests/run_tests.sh',