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

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/ctdb/tests/src/ctdb_test.c b/ctdb/tests/src/ctdb_test.c
index fbbe63d5698b6aaab76512aa4a73b13db6f4fe3d..5a067ab749130d1c2bfcf7c2137fe5c52654433a 100644 (file)
--- 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 a360ddfc9c7de99047575932d49d71660082d860..4017d315e986501caa6d2c978ba498f8eeadf406 100644 (file)
--- 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 be8e4a720c4c1105df2d7debc1720c5f964045b7..7c791ff6c7bf1247aded3767ae684ab5406470bd 100755 (executable)
--- 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}')