r14720: Add torture_context argument to all torture tests

(This used to be commit 3c7a5ce29108dd82210dc3e1f00414f545949e1d)

7 files changed, 15 insertions, 9 deletions

diff --git a/source4/torture/nbt/browse.c b/source4/torture/nbt/browse.c
index 415994ee86..1fe284f568 100644
--- a/source4/torture/nbt/browse.c
+++ b/source4/torture/nbt/browse.c
@@ -23,11 +23,12 @@
 #include "includes.h"
 #include "librpc/gen_ndr/nbt.h"
 #include "libcli/resolve/resolve.h"
+#include "torture/torture.h"
 
 /*
   test nbt dgram operations
 */
-BOOL torture_nbt_browse(void)
+BOOL torture_nbt_browse(struct torture_context *torture)
 {
 	const char *address;
 	struct nbt_name name;
diff --git a/source4/torture/nbt/dgram.c b/source4/torture/nbt/dgram.c
index 79bc3995dd..d847595e3d 100644
--- a/source4/torture/nbt/dgram.c
+++ b/source4/torture/nbt/dgram.c
@@ -348,7 +348,7 @@ failed:
 /*
   test nbt dgram operations
 */
-BOOL torture_nbt_dgram(void)
+BOOL torture_nbt_dgram(struct torture_context *torture)
 {
 	const char *address;
 	struct nbt_name name;
diff --git a/source4/torture/nbt/query.c b/source4/torture/nbt/query.c
index e9c302d89c..10e8848b46 100644
--- a/source4/torture/nbt/query.c
+++ b/source4/torture/nbt/query.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "lib/events/events.h"
 #include "libcli/resolve/resolve.h"
+#include "torture/torture.h"
 
 struct result_struct {
 	int num_pass;
@@ -101,7 +102,7 @@ failed:
 /*
   benchmark how fast a server can respond to name queries
 */
-BOOL torture_bench_nbt(void)
+BOOL torture_bench_nbt(struct torture_context *torture)
 {
 	const char *address;
 	struct nbt_name name;
diff --git a/source4/torture/nbt/register.c b/source4/torture/nbt/register.c
index 9b928fefcf..1663adcdf2 100644
--- a/source4/torture/nbt/register.c
+++ b/source4/torture/nbt/register.c
@@ -25,6 +25,7 @@
 #include "libcli/resolve/resolve.h"
 #include "system/network.h"
 #include "netif/netif.h"
+#include "torture/torture.h"
 
 #define CHECK_VALUE(v, correct) do { \
 	if ((v) != (correct)) { \
@@ -175,7 +176,7 @@ static BOOL nbt_refresh_own(TALLOC_CTX *mem_ctx, struct nbt_name *name,
 /*
   test name registration to a server
 */
-BOOL torture_nbt_register(void)
+BOOL torture_nbt_register(struct torture_context *torture)
 {
 	const char *address;
 	struct nbt_name name;
diff --git a/source4/torture/nbt/wins.c b/source4/torture/nbt/wins.c
index f983764129..3062fb1a30 100644
--- a/source4/torture/nbt/wins.c
+++ b/source4/torture/nbt/wins.c
@@ -26,6 +26,7 @@
 #include "system/network.h"
 #include "netif/netif.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
+#include "torture/torture.h"
 
 #define CHECK_VALUE(v, correct) do { \
 	if ((v) != (correct)) { \
@@ -368,7 +369,7 @@ static BOOL nbt_test_wins(TALLOC_CTX *mem_ctx, const char *address)
 /*
   test WINS operations
 */
-BOOL torture_nbt_wins(void)
+BOOL torture_nbt_wins(struct torture_context *torture)
 {
 	const char *address;
 	struct nbt_name name;
diff --git a/source4/torture/nbt/winsbench.c b/source4/torture/nbt/winsbench.c
index e629b842e7..f0e90ec932 100644
--- a/source4/torture/nbt/winsbench.c
+++ b/source4/torture/nbt/winsbench.c
@@ -26,6 +26,7 @@
 #include "libcli/resolve/resolve.h"
 #include "system/network.h"
 #include "netif/netif.h"
+#include "torture/torture.h"
 
 struct wins_state {
 	int num_names;
@@ -273,7 +274,7 @@ static BOOL bench_wins(TALLOC_CTX *mem_ctx, struct nbt_name *name, const char *a
   benchmark how fast a WINS server can respond to a mixture of
   registration/refresh/release and name query requests
 */
-BOOL torture_bench_wins(void)
+BOOL torture_bench_wins(struct torture_context *torture)
 {
 	const char *address;
 	struct nbt_name name;
diff --git a/source4/torture/nbt/winsreplication.c b/source4/torture/nbt/winsreplication.c
index 07c4865bdf..8b0dabca23 100644
--- a/source4/torture/nbt/winsreplication.c
+++ b/source4/torture/nbt/winsreplication.c
@@ -29,6 +29,7 @@
 #include "system/network.h"
 #include "netif/netif.h"
 #include "librpc/gen_ndr/ndr_nbt.h"
+#include "torture/torture.h"
 
 #define CHECK_STATUS(status, correct) do { \
 	if (!NT_STATUS_EQUAL(status, correct)) { \
@@ -9625,7 +9626,7 @@ static void test_conflict_owned_active_vs_replica_handler(struct nbt_name_socket
 /*
   test simple WINS replication operations
 */
-BOOL torture_nbt_winsreplication_simple(void)
+BOOL torture_nbt_winsreplication_simple(struct torture_context *torture)
 {
 	const char *address;
 	struct nbt_name name;
@@ -9657,7 +9658,7 @@ BOOL torture_nbt_winsreplication_simple(void)
 /*
   test WINS replication replica conflicts operations
 */
-BOOL torture_nbt_winsreplication_replica(void)
+BOOL torture_nbt_winsreplication_replica(struct torture_context *torture)
 {
 	const char *address;
 	struct nbt_name name;
@@ -9691,7 +9692,7 @@ BOOL torture_nbt_winsreplication_replica(void)
 /*
   test WINS replication owned conflicts operations
 */
-BOOL torture_nbt_winsreplication_owned(void)
+BOOL torture_nbt_winsreplication_owned(struct torture_context *torture)
 {
 	const char *address;
 	struct nbt_name name;