summaryrefslogtreecommitdiff
path: root/ctdb
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2022-05-04 09:17:40 +1000
committerMartin Schwenke <martins@samba.org>2022-07-28 10:09:34 +0000
commitb195e8c0d0c597be87387f477ebfb62244979e39 (patch)
tree3802ab086fe538e464c0221b54ea563d94af509e /ctdb
parent3efa56aa61da952f869f43188b0d53a11c820ca0 (diff)
downloadsamba-b195e8c0d0c597be87387f477ebfb62244979e39.tar.gz
ctdb-build: Sort sources in ctdb-util and ctdb_unit_tests
Also, rename ctdb_unit_tests to ctdb_util_tests. The sorting makes it clear that only items from ctdb-util are tested here. Signed-off-by: Martin Schwenke <martin@meltin.net> Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb')
-rw-r--r--ctdb/wscript49
1 files changed, 30 insertions, 19 deletions
diff --git a/ctdb/wscript b/ctdb/wscript
index 785c0225458..4a31944e865 100644
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -423,14 +423,25 @@ def build(bld):
bld.SAMBA_SUBSYSTEM('ctdb-util',
source=bld.SUBDIR('common',
- '''db_hash.c srvid.c reqid.c
- pkt_read.c pkt_write.c comm.c
- logging.c rb_tree.c tunable.c
- pidfile.c run_proc.c
+ '''cmdline.c
+ comm.c
+ conf.c
+ db_hash.c
+ event_script.c
hash_count.c
- run_event.c event_script.c
+ line.c
+ logging.c
+ path.c
+ pidfile.c
+ pkt_read.c
+ pkt_write.c
+ rb_tree.c
+ reqid.c
+ run_event.c
+ run_proc.c
sock_client.c
- cmdline.c path.c conf.c line.c
+ srvid.c
+ tunable.c
'''),
deps='''samba-util sys_rw tevent-util
replace talloc tevent tdb popt''')
@@ -899,27 +910,27 @@ def build(bld):
install_path='${CTDB_TEST_LIBEXECDIR}')
# Unit tests
- ctdb_unit_tests = [
+ ctdb_util_tests = [
+ 'cmdline_test',
+ 'comm_client_test',
+ 'comm_server_test',
+ 'comm_test',
+ 'conf_test',
'db_hash_test',
- 'srvid_test',
+ 'event_script_test',
+ 'hash_count_test',
+ 'line_test',
+ 'pidfile_test',
'pkt_read_test',
'pkt_write_test',
- 'comm_test',
- 'comm_server_test',
- 'comm_client_test',
- 'pidfile_test',
+ 'run_event_test',
'run_proc_test',
'sock_io_test',
- 'hash_count_test',
- 'run_event_test',
- 'cmdline_test',
- 'conf_test',
- 'line_test',
- 'event_script_test',
+ 'srvid_test',
'tunable_test',
]
- for target in ctdb_unit_tests:
+ for target in ctdb_util_tests:
src = 'tests/src/' + target + '.c'
bld.SAMBA_BINARY(target,