From: Martin Schwenke Date: Tue, 3 May 2022 23:02:12 +0000 (+1000) Subject: ctdb-build: Separate test backtrace support into separate subsystem X-Git-Tag: samba-4.17.0rc1~258 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7a1c43fc745c09e8dd95eae3de4cebc0678e4110;p=thirdparty%2Fsamba.git ctdb-build: Separate test backtrace support into separate subsystem A convention when testing members of ctdb-util is to include the .c file so that static functions can potentially be tested. This means that such tests can't be linked against ctdb-util or duplicate symbols will be encountered. ctdb-tests-common depends on ctdb-client, which depends in turn on ctdb-util, so this can't be used to pull in backtrace support. Instead, make ctdb-tests-backtrace its own subsystem. Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs --- diff --git a/ctdb/wscript b/ctdb/wscript index 4a31944e865..d56655da4bc 100644 --- a/ctdb/wscript +++ b/ctdb/wscript @@ -956,7 +956,7 @@ def build(bld): bld.SAMBA_BINARY('system_socket_test', source='tests/src/system_socket_test.c', - deps='''ctdb-tests-common + deps='''ctdb-tests-backtrace talloc ctdb-protocol-util pcap @@ -1030,7 +1030,6 @@ def build(bld): source=bld.SUBDIR('tests/src', '''cluster_wait.c test_options.c - test_backtrace.c '''), deps='''ctdb-client samba-util @@ -1040,6 +1039,12 @@ def build(bld): tevent tdb''') + bld.SAMBA_SUBSYSTEM('ctdb-tests-backtrace', + source=bld.SUBDIR('tests/src', + 'test_backtrace.c'), + deps='''samba-util + replace''') + # Test binaries ctdb_tests = [ 'g_lock_loop', @@ -1087,7 +1092,7 @@ def build(bld): bld.SAMBA_BINARY('cluster_mutex_test', source='tests/src/cluster_mutex_test.c', - deps='''ctdb-tests-common + deps='''ctdb-tests-backtrace samba-util talloc tevent