'ctdb_diagnostics.1',
'ctdbd_wrapper.1',
'onnode.1',
+ 'ctdb-script.options.5',
+ 'ctdb.sysconfig.5',
'ctdbd.conf.5',
'ctdb.7',
'ctdb-statistics.7',
logging.c rb_tree.c tunable.c
pidfile.c run_proc.c
hash_count.c run_event.c
- sock_client.c version.c'''),
+ sock_client.c version.c
+ cmdline.c path.c conf.c
+ '''),
deps='''samba-util sys_rw tevent-util
- replace talloc tevent tdb''')
+ replace talloc tevent tdb popt''')
+
+ bld.SAMBA_SUBSYSTEM('ctdb-logging-conf',
+ source='common/logging_conf.c',
+ deps='ctdb-util talloc')
bld.SAMBA_SUBSYSTEM('ctdb-protocol',
source=bld.SUBDIR('protocol',
deps='replace talloc tdb')
bld.SAMBA_SUBSYSTEM('ctdb-client',
- source=bld.SUBDIR('client', 'ctdb_client.c'),
- includes='include',
- deps='''replace popt talloc tevent tdb
- samba-util tdb-wrap ctdb-util''')
-
- bld.SAMBA_SUBSYSTEM('ctdb-client2',
source=bld.SUBDIR('client',
'''client_connect.c client_call.c
client_message.c client_control.c
includes='include',
deps='ctdb-protocol-util replace talloc tevent')
+ bld.SAMBA_BINARY('ctdb-path',
+ source='common/path_tool.c',
+ cflags='-DCTDB_PATH_TOOL',
+ deps='''ctdb-util samba-util talloc replace popt''',
+ install_path='${CTDB_HELPER_BINDIR}')
+
+ bld.SAMBA_BINARY('ctdb-config',
+ source='common/conf_tool.c',
+ cflags='-DCTDB_CONF_TOOL',
+ deps='''ctdb-logging-conf
+ ctdb-util samba-util talloc replace popt''',
+ install_path='${CTDB_HELPER_BINDIR}')
+
bld.SAMBA_BINARY('ctdbd',
source='server/ctdbd.c ' +
bld.SUBDIR('server',
ctdb_statistics.c
ctdb_update_record.c
ctdb_lock.c ctdb_fork.c
- ctdb_tunnel.c'''),
+ ctdb_tunnel.c ctdb_client.c'''),
includes='include',
- deps='''ctdb-client ctdb-common ctdb-system ctdb-protocol
+ deps='''ctdb-common ctdb-system ctdb-protocol
ctdb-tcp ctdb-util replace sys_rw popt
- talloc tevent tdb talloc_report''' +
+ talloc tevent tdb-wrap tdb talloc_report''' +
ib_deps,
install_path='${SBINDIR}',
manpages='ctdbd.1')
bld.SAMBA_BINARY('ctdb',
source='tools/ctdb.c',
- deps='''ctdb-client2 ctdb-protocol ctdb-protocol-util
+ deps='''ctdb-client ctdb-protocol ctdb-protocol-util
ctdb-util ctdb-system samba-util sys_rw popt''',
install_path='${BINDIR}',
manpages='ctdb.1')
bld.SAMBA_BINARY('ctdb_event',
source='tools/ctdb_event.c',
- deps='''ctdb-client2 ctdb-protocol ctdb-protocol-util
+ deps='''ctdb-client ctdb-protocol ctdb-protocol-util
ctdb-util ctdb-system samba-util replace''',
install_path='${CTDB_HELPER_BINDIR}')
bld.SAMBA_BINARY('ctdb_recovery_helper',
source='server/ctdb_recovery_helper.c',
- deps='''ctdb-client2 ctdb-protocol ctdb-util
+ deps='''ctdb-client ctdb-protocol ctdb-util
samba-util sys_rw replace tdb''',
install_path='${CTDB_HELPER_BINDIR}')
bld.SAMBA_BINARY('ctdb_takeover_helper',
source='server/ctdb_takeover_helper.c',
- deps='''ctdb-client2 ctdb-protocol ctdb-util
+ deps='''ctdb-client ctdb-protocol ctdb-util
samba-util sys_rw replace ctdb-ipalloc popt''',
install_path='${CTDB_HELPER_BINDIR}')
bld.SAMBA_BINARY('pmdactdb',
source='utils/pmda/pmda_ctdb.c',
includes='include',
- deps='''ctdb-client2 ctdb-protocol ctdb-util
+ deps='''ctdb-client ctdb-protocol ctdb-util
samba-util pcp_pmda pcp''',
install_path='${CTDB_PMDADIR}')
bld.INSTALL_FILES('${CTDB_PMDADIR}', 'utils/pmda/Install',
'sock_io_test',
'hash_count_test',
'run_event_test',
+ 'cmdline_test',
+ 'conf_test',
]
for target in ctdb_unit_tests:
bld.SAMBA_BINARY(target,
source=src,
- deps='''talloc tevent tdb tevent-util
+ deps='''talloc tevent tdb tevent-util popt
LIBASYNC_REQ samba-util sys_rw''',
install_path='${CTDB_TEST_LIBEXECDIR}')
bld.SAMBA_BINARY(target,
source=src,
includes='include',
- deps='''ctdb-client2 ctdb-protocol ctdb-util
+ deps='''ctdb-client ctdb-protocol ctdb-util
samba-util ctdb-tests-common''',
install_path='${CTDB_TEST_LIBEXECDIR}')
bld.SAMBA_BINARY('ibwrapper_test',
source='ib/ibwrapper_test.c',
includes='include',
- deps='replace talloc ctdb-client ctdb-common sys_rw' +
+ deps='replace talloc ctdb-common sys_rw' +
ib_deps,
install_path='${CTDB_TEST_LIBEXECDIR}')
'complex',
'cunit',
'eventd',
- 'events.d',
'eventscripts',
'onnode',
'shellcheck',
bld.symlink_as(os.path.join(bld.env.BINDIR, 'ctdb_run_cluster_tests'),
'ctdb_run_tests')
- # Tests that use onnode need to overwrite link to in-tree
- # functions file when installed
- bld.symlink_as(os.path.join(bld.env.CTDB_TEST_DATADIR, 'onnode/functions'),
- os.path.join(bld.env.CTDB_ETCDIR, 'functions'))
- bld.symlink_as(os.path.join(bld.env.CTDB_TEST_DATADIR, 'simple/functions'),
- os.path.join(bld.env.CTDB_ETCDIR, 'functions'))
-
- # Need a link to nodes file because $CTDB_BASE is overridden
- bld.symlink_as(os.path.join(bld.env.CTDB_TEST_DATADIR, 'simple/nodes'),
- os.path.join(bld.env.CTDB_ETCDIR, 'nodes'))
-
def testonly(ctx):
cmd = 'tests/run_tests.sh -V tests/var'