From 86430d528bbb1d8ddb6de57c7a35e15b31977498 Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Fri, 15 Aug 2014 16:15:37 +1000 Subject: [PATCH] ctdb-build: Tests don't include lib/util/*.c, link ctdb-util instead Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs --- ctdb/tests/src/ctdb_test.c | 10 ---------- ctdb/tests/src/ctdbd_test.c | 10 ---------- ctdb/wscript | 6 +++--- 3 files changed, 3 insertions(+), 23 deletions(-) diff --git a/ctdb/tests/src/ctdb_test.c b/ctdb/tests/src/ctdb_test.c index fbbe63d5698..5a067ab7491 100644 --- a/ctdb/tests/src/ctdb_test.c +++ b/ctdb/tests/src/ctdb_test.c @@ -110,21 +110,11 @@ bool ctdb_sys_have_ip(ctdb_sock_addr *addr); #undef TIMELIMIT #include "tools/ctdb_vacuum.c" -/* UTIL_OBJ */ -#include "lib/util/idtree.c" -#include "lib/util/util.c" -#include "lib/util/util_time.c" -#include "lib/util/util_file.c" -#include "lib/util/fault.c" -#include "lib/util/substitute.c" -#include "lib/util/signal.c" - /* CTDB_COMMON_OBJ */ #include "common/ctdb_io.c" #include "common/ctdb_util.c" #include "common/ctdb_ltdb.c" #include "common/ctdb_message.c" -#include "lib/util/debug.c" #include "common/rb_tree.c" #include "common/system_common.c" #include "common/ctdb_logging.c" diff --git a/ctdb/tests/src/ctdbd_test.c b/ctdb/tests/src/ctdbd_test.c index a360ddfc9c7..4017d315e98 100644 --- a/ctdb/tests/src/ctdbd_test.c +++ b/ctdb/tests/src/ctdbd_test.c @@ -31,22 +31,12 @@ int script_log_level; bool fast_start; -/* UTIL_OBJ */ -#include "lib/util/idtree.c" -#include "lib/util/util.c" -#include "lib/util/util_time.c" -#include "lib/util/util_file.c" -#include "lib/util/fault.c" -#include "lib/util/substitute.c" -#include "lib/util/signal.c" - /* CTDB_COMMON_OBJ */ #include "common/ctdb_io.c" #include "common/ctdb_util.c" #include "common/ctdb_ltdb.c" #include "common/ctdb_message.c" #include "common/cmdline.c" -#include "lib/util/debug.c" #include "common/rb_tree.c" #include "common/system_common.c" #include "common/ctdb_logging.c" diff --git a/ctdb/wscript b/ctdb/wscript index be8e4a720c4..7c791ff6c7b 100755 --- a/ctdb/wscript +++ b/ctdb/wscript @@ -454,7 +454,7 @@ def build(bld): bld.SAMBA_BINARY('ctdb_takeover_tests', source='tests/src/ctdb_takeover_tests.c', deps='''replace popt tdb tevent talloc ctdb-system - tdb-wrap''' + + ctdb-util tdb-wrap''' + ib_deps, includes='include include/internal lib/util', install_path='${CTDB_TEST_LIBDIR}') @@ -462,14 +462,14 @@ def build(bld): bld.SAMBA_BINARY('ctdb_functest', source='tests/src/ctdb_functest.c', deps='''replace tdb tevent talloc popt ctdb-system - tdb-wrap''', + ctdb-util tdb-wrap''', includes='include include/internal lib/util', install_path='${CTDB_TEST_LIBDIR}') bld.SAMBA_BINARY('ctdb_stubtest', source='tests/src/ctdb_test.c', deps='''replace tdb tevent talloc popt ctdb-system - tdb-wrap''', + ctdb-util tdb-wrap''', includes='include include/internal lib/util', install_path='${CTDB_TEST_LIBDIR}') -- 2.11.4.GIT