sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

ctdb-build: Tests don't include lib/util/*.c, link ctdb-util instead

Browse Source 
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2014-08-15 16:15:37 +10:00 committed by Amitay Isaacs
parent 9c69a71740
commit 86430d528b
3 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ctdb/tests/src/ctdb_test.c
View File

@ -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"

10
ctdb/tests/src/ctdbd_test.c
View File

@ -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"

6
ctdb/wscript
View File

@ -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}')