r19339: Merge my 4.0-unittest branch. This adds an API for more fine-grained

output in the testsuite rather than just True or False for a
set of tests.

The aim is to use this for:
 * known failure lists (run all tests and detect tests that
						started working or started failing). This
   would allow us to get rid of the RPC-SAMBA3-* tests
 * nicer torture output
 * simplification of the testsuite system
 * compatibility with other unit testing systems
 * easier usage of smbtorture (being able to run one test
						and automatically set up the environment for that)

This is still a work-in-progress; expect more updates over the next couple of
days.
(This used to be commit 0eb6097305776325c75081356309115f445a7218)

3 files changed, 21 insertions, 20 deletions

diff --git a/source4/torture/smb2/config.mk b/source4/torture/smb2/config.mk
index b24c1642a1..6403f231f5 100644
--- a/source4/torture/smb2/config.mk
+++ b/source4/torture/smb2/config.mk
@@ -8,8 +8,6 @@ PRIVATE_PROTO_HEADER = \
 		proto.h
 OBJ_FILES = \
 		connect.o \
-		dir.o \
-		maxwrite.o \
 		scan.o \
 		util.o \
 		getinfo.o \
diff --git a/source4/torture/smb2/connect.c b/source4/torture/smb2/connect.c
index bb6ba0c39d..9f36e4d707 100644
--- a/source4/torture/smb2/connect.c
+++ b/source4/torture/smb2/connect.c
@@ -75,7 +75,7 @@ static NTSTATUS torture_smb2_write(struct smb2_tree *tree, struct smb2_handle ha
 	int i;
 	
 	if (lp_parm_bool(-1, "torture", "dangerous", False)) {
-		data = data_blob_talloc(tree, NULL, 16000000);
+		data = data_blob_talloc(tree, NULL, 160000);
 	} else if (lp_parm_bool(-1, "target", "samba4", False)) {
 		data = data_blob_talloc(tree, NULL, UINT16_MAX);
 	} else {
@@ -90,8 +90,6 @@ static NTSTATUS torture_smb2_write(struct smb2_tree *tree, struct smb2_handle ha
 	w.in.offset      = 0;
 	w.in.data        = data;
 
-	printf("writing %d bytes\n", data.length);
-
 	status = smb2_write(tree, &w);
 	if (!NT_STATUS_IS_OK(status)) {
 		printf("write failed - %s\n", nt_errstr(status));
@@ -122,8 +120,6 @@ static NTSTATUS torture_smb2_write(struct smb2_tree *tree, struct smb2_handle ha
 	r.in.length      = data.length;
 	r.in.offset      = 0;
 
-	printf("reading %d bytes\n", data.length);
-
 	status = smb2_read(tree, tree, &r);
 	if (!NT_STATUS_IS_OK(status)) {
 		printf("read failed - %s\n", nt_errstr(status));
@@ -143,7 +139,8 @@ static NTSTATUS torture_smb2_write(struct smb2_tree *tree, struct smb2_handle ha
 /*
   send a create
 */
-struct smb2_handle torture_smb2_create(struct smb2_tree *tree, const char *fname)
+static struct smb2_handle torture_smb2_create(struct smb2_tree *tree, 
+					      const char *fname)
 {
 	struct smb2_create io;
 	NTSTATUS status;
diff --git a/source4/torture/smb2/smb2.c b/source4/torture/smb2/smb2.c
index cb0401b5d6..9399010afe 100644
--- a/source4/torture/smb2/smb2.c
+++ b/source4/torture/smb2/smb2.c
@@ -27,18 +27,24 @@
 
 NTSTATUS torture_smb2_init(void)
 {
-	register_torture_op("SMB2-CONNECT", torture_smb2_connect);
-	register_torture_op("SMB2-SCAN", torture_smb2_scan);
-	register_torture_op("SMB2-SCANGETINFO", torture_smb2_getinfo_scan);
-	register_torture_op("SMB2-SCANSETINFO", torture_smb2_setinfo_scan);
-	register_torture_op("SMB2-SCANFIND", torture_smb2_find_scan);
-	register_torture_op("SMB2-GETINFO", torture_smb2_getinfo);
-	register_torture_op("SMB2-SETINFO", torture_smb2_setinfo);
-	register_torture_op("SMB2-FIND", torture_smb2_find);
-	register_torture_op("SMB2-LOCK", torture_smb2_lock);
-	register_torture_op("SMB2-NOTIFY", torture_smb2_notify);
-	register_torture_op("SMB2-MAXWRITE", torture_smb2_maxwrite);
-	register_torture_op("SMB2-DIR", torture_smb2_dir);
+	struct torture_suite *suite = torture_suite_create(
+										talloc_autofree_context(),
+										"SMB2");
+	torture_suite_add_simple_test(suite, "CONNECT", torture_smb2_connect);
+	torture_suite_add_simple_test(suite, "SCAN", torture_smb2_scan);
+	torture_suite_add_simple_test(suite, "SCANGETINFO", torture_smb2_getinfo_scan);
+	torture_suite_add_simple_test(suite, "SCANSETINFO", torture_smb2_setinfo_scan);
+	torture_suite_add_simple_test(suite, "SCANFIND", torture_smb2_find_scan);
+	torture_suite_add_simple_test(suite, "GETINFO", torture_smb2_getinfo);
+	torture_suite_add_simple_test(suite, "SETINFO", torture_smb2_setinfo);
+	torture_suite_add_simple_test(suite, "FIND", torture_smb2_find);
+	torture_suite_add_simple_test(suite, "LOCK", torture_smb2_lock);
+	torture_suite_add_simple_test(suite, "NOTIFY", torture_smb2_notify);
+
+	suite->description = talloc_strdup(suite, 
+							"SMB2-specific tests");
+
+	torture_register_suite(suite);
 
 	return NT_STATUS_OK;
 }