ctdb-tests: Link ctdb-util instead of including

These are never replaced with stubs.

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 310a4c7d9eca76a331e245d96933571689141ac9..a26d959f09d68e908b8bdda0d1f55830246c9661 100644 (file)
--- a/ctdb/tests/src/ctdb_test.c
+++ b/ctdb/tests/src/ctdb_test.c
@@ -172,11 +172,6 @@ ctdb_get_capabilities(struct ctdb_context *ctdb,
 #include "common/ctdb_io.c"
 #include "common/ctdb_util.c"
 #include "common/ctdb_ltdb.c"
-#include "common/db_hash.c"
-#include "common/srvid.c"
-#include "common/rb_tree.c"
-#include "common/reqid.c"
-#include "common/logging.c"
 
 /* CTDB_CLIENT_OBJ */
 #include "client/ctdb_client.c"

diff --git a/ctdb/tests/src/ctdbd_test.c b/ctdb/tests/src/ctdbd_test.c
index 018aa2a7a88f21c0c4e4a4cae5a43090d5766e33..5fa70144ed4995dd4a547268b9f69d371ca7520d 100644 (file)
--- a/ctdb/tests/src/ctdbd_test.c
+++ b/ctdb/tests/src/ctdbd_test.c
@@ -41,12 +41,7 @@ bool fast_start;
 #include "common/ctdb_io.c"
 #include "common/ctdb_util.c"
 #include "common/ctdb_ltdb.c"
-#include "common/db_hash.c"
-#include "common/srvid.c"
 #include "common/cmdline.c"
-#include "common/rb_tree.c"
-#include "common/reqid.c"
-#include "common/logging.c"
 
 /* CTDB_SERVER_OBJ */
 #include "server/ctdb_daemon.c"

diff --git a/ctdb/wscript b/ctdb/wscript
index 16d9d02270d9aa6982b57849c672b5548239fbe9..f21b51dd2ea470535f8c1dfe484a7893ee9cd1c0 100755 (executable)
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -680,7 +680,7 @@ def build(bld):
                      source='tests/src/ctdb_takeover_tests.c',
                      deps='''replace popt tdb tevent talloc ctdb-system
                              samba-util tdb-wrap talloc_report
-                             ctdb-protocol''' +
+                             ctdb-protocol ctdb-util''' +
                           ib_deps,
                      includes='include',
                      install_path='${CTDB_TEST_LIBDIR}')
@@ -688,14 +688,14 @@ def build(bld):
     bld.SAMBA_BINARY('ctdb_functest',
                      source='tests/src/ctdb_functest.c',
                      deps='''replace tdb tevent talloc popt ctdb-system
-                             samba-util tdb-wrap''',
+                             samba-util tdb-wrap ctdb-util''',
                      includes='include',
                      install_path='${CTDB_TEST_LIBDIR}')
 
     bld.SAMBA_BINARY('ctdb_stubtest',
                      source='tests/src/ctdb_test.c',
                      deps='''replace tdb tevent talloc popt ctdb-system
-                             samba-util tdb-wrap''',
+                             samba-util tdb-wrap ctdb-util''',
                      includes='include',
                      install_path='${CTDB_TEST_LIBDIR}')