r16333: Move more code out of the core smbtorture. It now no longer

contains protocol-specific code.
(This used to be commit 819d3b457648ffb7526a770e842badc17b6061fb)

3 files changed, 63 insertions, 3 deletions

diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk
index 7bcd8070ca..001ff559d5 100644
--- a/source4/torture/local/config.mk
+++ b/source4/torture/local/config.mk
@@ -1,6 +1,8 @@
 #################################
 # Start SUBSYSTEM TORTURE_LOCAL
-[SUBSYSTEM::TORTURE_LOCAL]
+[MODULE::TORTURE_LOCAL]
+SUBSYSTEM = torture
+INIT_FUNCTION = torture_local_init
 PRIVATE_PROTO_HEADER = \
 		proto.h
 OBJ_FILES = \
@@ -17,7 +19,8 @@ OBJ_FILES = \
 		util_file.o \
 		sddl.o \
 		ndr.o \
-		event.o
+		event.o \
+		local.o
 PUBLIC_DEPENDENCIES = \
 		RPC_NDR_ECHO \
 		LIBCLI_SMB \
diff --git a/source4/torture/local/local.c b/source4/torture/local/local.c
new file mode 100644
index 0000000000..8f95cec4d5
--- /dev/null
+++ b/source4/torture/local/local.c
@@ -0,0 +1,57 @@
+/* 
+   Unix SMB/CIFS implementation.
+   SMB torture tester
+   Copyright (C) Jelmer Vernooij 2006
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "includes.h"
+#include "torture/torture.h"
+#include "torture/local/proto.h"
+#include "torture/auth/proto.h"
+
+/* ignore me */ static struct torture_suite *
+	(*suite_generators[]) (TALLOC_CTX *mem_ctx) =
+{ 
+	torture_local_binding_string, 
+	torture_ntlmssp, 
+	torture_local_messaging, 
+	torture_local_irpc, 
+	torture_local_util_strlist, 
+	torture_local_util_file, 
+	torture_local_idtree, 
+	torture_local_iconv,
+	torture_local_socket, 
+	torture_pac, 
+	torture_registry, 
+	torture_local_resolve,
+	torture_local_sddl,
+	torture_local_ndr, 
+	torture_local_event, 
+	NULL
+};
+
+NTSTATUS torture_local_init(void)
+{
+	int i;
+	TALLOC_CTX *mem_ctx = talloc_autofree_context();
+
+	register_torture_op("LOCAL-TALLOC", torture_local_talloc);
+	for (i = 0; suite_generators[i]; i++)
+		torture_register_suite(suite_generators[i](mem_ctx));
+
+	return NT_STATUS_OK;
+}
diff --git a/source4/torture/local/util_file.c b/source4/torture/local/util_file.c
index c950e68c6e..3c11d3d94e 100644
--- a/source4/torture/local/util_file.c
+++ b/source4/torture/local/util_file.c
@@ -84,7 +84,7 @@ static BOOL test_afdgets(struct torture_context *test, const void *data)
 
 struct torture_suite *torture_local_util_file(TALLOC_CTX *mem_ctx)
 {
-	struct torture_suite *suite = torture_suite_create(mem_ctx, "util_file");
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "LOCAL-FILE");
 
 	torture_suite_add_simple_tcase(suite, "file_load_save", 
 								   test_file_load_save, NULL);