From 909b111f587705a45f63540b39968f1af58a9b5d Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 25 Mar 2006 16:01:28 +0000
Subject: r14720: Add torture_context argument to all torture tests (This used
 to be commit 3c7a5ce29108dd82210dc3e1f00414f545949e1d)

---
 source4/torture/local/binding_string.c | 3 ++-
 source4/torture/local/iconv.c          | 4 ++--
 source4/torture/local/idtree.c         | 3 ++-
 source4/torture/local/irpc.c           | 3 ++-
 source4/torture/local/messaging.c      | 3 ++-
 source4/torture/local/ndr.c            | 2 +-
 source4/torture/local/registry.c       | 3 ++-
 source4/torture/local/resolve.c        | 3 ++-
 source4/torture/local/sddl.c           | 3 ++-
 source4/torture/local/socket.c         | 2 +-
 source4/torture/local/util_file.c      | 3 ++-
 source4/torture/local/util_strlist.c   | 3 ++-
 12 files changed, 22 insertions(+), 13 deletions(-)

(limited to 'source4/torture/local')

diff --git a/source4/torture/local/binding_string.c b/source4/torture/local/binding_string.c
index 2d180a09ef..3384a9b9d6 100644
--- a/source4/torture/local/binding_string.c
+++ b/source4/torture/local/binding_string.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "librpc/gen_ndr/epmapper.h"
 #include "librpc/rpc/dcerpc.h"
+#include "torture/torture.h"
 
 static BOOL test_BindingString(TALLOC_CTX *mem_ctx, const char *binding)
 {
@@ -116,7 +117,7 @@ static const char *test_strings[] = {
 	"ncacn_unix_stream:[/tmp/epmapper,sign]",
 };
 
-BOOL torture_local_binding_string(void) 
+BOOL torture_local_binding_string(struct torture_context *torture) 
 {
 	BOOL ret = True;
 	TALLOC_CTX *mem_ctx = talloc_init("test_BindingString");
diff --git a/source4/torture/local/iconv.c b/source4/torture/local/iconv.c
index 324ee489c1..7f2e328960 100644
--- a/source4/torture/local/iconv.c
+++ b/source4/torture/local/iconv.c
@@ -312,7 +312,7 @@ static int test_codepoint(unsigned int codepoint)
 	return 1;
 }
 
-BOOL torture_local_iconv(void) 
+BOOL torture_local_iconv(struct torture_context *torture) 
 {
 	size_t size;
 	unsigned char inbuf[1000];
@@ -382,7 +382,7 @@ BOOL torture_local_iconv(void)
 
 #else
 
-BOOL torture_local_iconv(void) 
+BOOL torture_local_iconv(struct torture_context *torture) 
 {
 	printf("No native iconv library - can't run iconv test\n");
 	return True;
diff --git a/source4/torture/local/idtree.c b/source4/torture/local/idtree.c
index d4a81cb567..7afc5e9ab9 100644
--- a/source4/torture/local/idtree.c
+++ b/source4/torture/local/idtree.c
@@ -21,8 +21,9 @@
 */
 
 #include "includes.h"
+#include "torture/torture.h"
 
-BOOL torture_local_idtree(void) 
+BOOL torture_local_idtree(struct torture_context *torture) 
 {
 	struct idr_context *idr;
 	int i;
diff --git a/source4/torture/local/irpc.c b/source4/torture/local/irpc.c
index 75659b6b84..4fa3d0ad89 100644
--- a/source4/torture/local/irpc.c
+++ b/source4/torture/local/irpc.c
@@ -24,6 +24,7 @@
 #include "lib/events/events.h"
 #include "lib/messaging/irpc.h"
 #include "librpc/gen_ndr/ndr_echo.h"
+#include "torture/torture.h"
 
 const uint32_t MSG_ID1 = 1, MSG_ID2 = 2;
 
@@ -214,7 +215,7 @@ static BOOL test_speed(TALLOC_CTX *mem_ctx,
 }
 
 
-BOOL torture_local_irpc(void) 
+BOOL torture_local_irpc(struct torture_context *torture) 
 {
 	TALLOC_CTX *mem_ctx = talloc_init("torture_local_irpc");
 	BOOL ret = True;
diff --git a/source4/torture/local/messaging.c b/source4/torture/local/messaging.c
index 0d4dfc49a8..77bce155bc 100644
--- a/source4/torture/local/messaging.c
+++ b/source4/torture/local/messaging.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "lib/events/events.h"
 #include "lib/messaging/irpc.h"
+#include "torture/torture.h"
 
 enum {MY_PING=1000, MY_PONG, MY_EXIT};
 
@@ -144,7 +145,7 @@ static BOOL test_ping_speed(TALLOC_CTX *mem_ctx)
 	return ret;
 }
 
-BOOL torture_local_messaging(void) 
+BOOL torture_local_messaging(struct torture_context *torture) 
 {
 	TALLOC_CTX *mem_ctx = talloc_init("torture_local_messaging");
 	BOOL ret = True;
diff --git a/source4/torture/local/ndr.c b/source4/torture/local/ndr.c
index 305f75f9c0..afd890318f 100644
--- a/source4/torture/local/ndr.c
+++ b/source4/torture/local/ndr.c
@@ -83,7 +83,7 @@ BOOL test_check_string_terminator(TALLOC_CTX *mem_ctx)
 	return True;
 }
 
-BOOL torture_local_ndr(void)
+BOOL torture_local_ndr(struct torture_context *torture)
 {
 	TALLOC_CTX *mem_ctx;
 	BOOL ret = True;
diff --git a/source4/torture/local/registry.c b/source4/torture/local/registry.c
index 95f7d3afe7..623d30a5d8 100644
--- a/source4/torture/local/registry.c
+++ b/source4/torture/local/registry.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "lib/registry/registry.h"
 #include "lib/cmdline/popt_common.h"
+#include "torture/torture.h"
 
 static BOOL test_hive(TALLOC_CTX *mem_ctx, const char *backend, const char *location)
 {
@@ -80,7 +81,7 @@ static BOOL test_hive(TALLOC_CTX *mem_ctx, const char *backend, const char *loca
 	return True;
 }
 
-BOOL torture_registry(void) 
+BOOL torture_registry(struct torture_context *torture) 
 {
 	BOOL ret = True;
 	TALLOC_CTX *mem_ctx = talloc_init("torture_registry");
diff --git a/source4/torture/local/resolve.c b/source4/torture/local/resolve.c
index a52bfeeb48..58e313bfb4 100644
--- a/source4/torture/local/resolve.c
+++ b/source4/torture/local/resolve.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "lib/events/events.h"
 #include "libcli/resolve/resolve.h"
+#include "torture/torture.h"
 
 static BOOL test_async_resolve(TALLOC_CTX *mem_ctx)
 {
@@ -73,7 +74,7 @@ static BOOL test_sync_resolve(TALLOC_CTX *mem_ctx)
 }
 
 
-BOOL torture_local_resolve(void) 
+BOOL torture_local_resolve(struct torture_context *torture) 
 {
 	TALLOC_CTX *mem_ctx = talloc_init("torture_local_irpc");
 	BOOL ret = True;
diff --git a/source4/torture/local/sddl.c b/source4/torture/local/sddl.c
index 11e6ae1fd5..b491c0b8e8 100644
--- a/source4/torture/local/sddl.c
+++ b/source4/torture/local/sddl.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "libcli/security/proto.h"
+#include "torture/torture.h"
 
 
 /*
@@ -94,7 +95,7 @@ static const char *examples[] = {
 };
 
 /* test a set of example SDDL strings */
-BOOL torture_local_sddl(void) 
+BOOL torture_local_sddl(struct torture_context *torture) 
 {
 	int i;
 	BOOL ret = True;
diff --git a/source4/torture/local/socket.c b/source4/torture/local/socket.c
index 66268f4f80..acea977331 100644
--- a/source4/torture/local/socket.c
+++ b/source4/torture/local/socket.c
@@ -256,7 +256,7 @@ done:
 	return ret;
 }
 
-BOOL torture_local_socket(void) 
+BOOL torture_local_socket(struct torture_context *torture) 
 {
 	BOOL ret = True;
 	TALLOC_CTX *mem_ctx = talloc_new(NULL);
diff --git a/source4/torture/local/util_file.c b/source4/torture/local/util_file.c
index 5c5047de45..ead3ab052f 100644
--- a/source4/torture/local/util_file.c
+++ b/source4/torture/local/util_file.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
+#include "torture/torture.h"
 
 #define TEST_FILENAME "utilfile.test"
 #define TEST_LINE1 "This is list line 1..."
@@ -87,7 +88,7 @@ static BOOL test_afdgets(TALLOC_CTX *mem_ctx)
 	return True;
 }
 
-BOOL torture_local_util_file(void) 
+BOOL torture_local_util_file(struct torture_context *torture) 
 {
 	BOOL ret = True;
 	TALLOC_CTX *mem_ctx = talloc_init("test_util_file");
diff --git a/source4/torture/local/util_strlist.c b/source4/torture/local/util_strlist.c
index bf888da797..78ebcf44fb 100644
--- a/source4/torture/local/util_strlist.c
+++ b/source4/torture/local/util_strlist.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "torture/torture.h"
 
 static const char *test_lists_shell_strings[] = {
 	"",
@@ -69,7 +70,7 @@ static BOOL test_lists_shell(TALLOC_CTX *mem_ctx)
 	return True;
 }
 
-BOOL torture_local_util_strlist(void) 
+BOOL torture_local_util_strlist(struct torture_context *torture) 
 {
 	BOOL ret = True;
 	TALLOC_CTX *mem_ctx = talloc_init("test_util_strlist");
-- 
cgit