From 2f3551ca7cee59d4d053cceb87abdf1da1b3a1ad Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 1 Oct 2007 18:52:55 +0000 Subject: r25446: Merge some changes I made on the way home from SFO: 2007-09-29 More higher-level passing around of lp_ctx. 2007-09-29 Fix warning. 2007-09-29 Pass loadparm contexts on a higher level. 2007-09-29 Avoid using global loadparm context. (This used to be commit 3468952e771ab31f90b6c374ade01c5550810f42) --- source4/torture/local/dbspeed.c | 3 ++- source4/torture/local/irpc.c | 2 ++ source4/torture/local/messaging.c | 11 ++++++++--- 3 files changed, 12 insertions(+), 4 deletions(-) (limited to 'source4/torture/local') diff --git a/source4/torture/local/dbspeed.c b/source4/torture/local/dbspeed.c index fb4e5c3c3a..b6c1a43d48 100644 --- a/source4/torture/local/dbspeed.c +++ b/source4/torture/local/dbspeed.c @@ -26,6 +26,7 @@ #include "lib/ldb/include/ldb_errors.h" #include "lib/db_wrap.h" #include "torture/torture.h" +#include "param/param.h" float tdb_speed; @@ -174,7 +175,7 @@ static BOOL test_ldb_speed(struct torture_context *torture, const void *_data) torture_comment(torture, "Testing ldb speed for sidmap\n"); - ldb = ldb_wrap_connect(tmp_ctx, "tdb://test.ldb", + ldb = ldb_wrap_connect(tmp_ctx, global_loadparm, "tdb://test.ldb", NULL, NULL, LDB_FLG_NOSYNC, NULL); if (!ldb) { unlink("./test.ldb"); diff --git a/source4/torture/local/irpc.c b/source4/torture/local/irpc.c index ad1b22ca6f..70f9ac1e5f 100644 --- a/source4/torture/local/irpc.c +++ b/source4/torture/local/irpc.c @@ -220,11 +220,13 @@ static BOOL irpc_setup(struct torture_context *tctx, void **_data) data->ev = tctx->ev; torture_assert(tctx, data->msg_ctx1 = messaging_init(tctx, + lp_messaging_path(tctx, global_loadparm), cluster_id(MSG_ID1), data->ev), "Failed to init first messaging context"); torture_assert(tctx, data->msg_ctx2 = messaging_init(tctx, + lp_messaging_path(tctx, global_loadparm), cluster_id(MSG_ID2), data->ev), "Failed to init second messaging context"); diff --git a/source4/torture/local/messaging.c b/source4/torture/local/messaging.c index 6834c82fae..bf2b83a0e4 100644 --- a/source4/torture/local/messaging.c +++ b/source4/torture/local/messaging.c @@ -72,16 +72,21 @@ static bool test_ping_speed(struct torture_context *tctx) ev = tctx->ev; - msg_server_ctx = messaging_init(mem_ctx, cluster_id(1), ev); + msg_server_ctx = messaging_init(mem_ctx, + lp_messaging_path(tctx, global_loadparm), + cluster_id(1), ev); torture_assert(tctx, msg_server_ctx != NULL, "Failed to init ping messaging context"); messaging_register_tmp(msg_server_ctx, NULL, ping_message, &msg_ping); messaging_register_tmp(msg_server_ctx, mem_ctx, exit_message, &msg_exit); - msg_client_ctx = messaging_init(mem_ctx, cluster_id(2), ev); + msg_client_ctx = messaging_init(mem_ctx, + lp_messaging_path(mem_ctx, global_loadparm), + cluster_id(2), ev); - torture_assert(tctx, msg_client_ctx != NULL, "msg_client_ctx messaging_init() failed"); + torture_assert(tctx, msg_client_ctx != NULL, + "msg_client_ctx messaging_init() failed"); messaging_register_tmp(msg_client_ctx, &pong_count, pong_message, &msg_pong); -- cgit