s4:torture make a suite for smb2.*scan

Signed-off-by: Stefan Metzmacher <metze@samba.org>

diff --git a/source4/torture/smb2/scan.c b/source4/torture/smb2/scan.c
index 92fbc682c40b00b0a08ea252cf45cff1300f89f2..18a5cbf31236b617e71621e6631aaf7fe298cf82 100644 (file)
--- a/source4/torture/smb2/scan.c
+++ b/source4/torture/smb2/scan.c
@@ -32,7 +32,7 @@
 /* 
    scan for valid SMB2 getinfo levels
 */
-bool torture_smb2_getinfo_scan(struct torture_context *torture)
+static bool torture_smb2_getinfo_scan(struct torture_context *torture)
 {
        struct smb2_tree *tree;
        NTSTATUS status;
@@ -108,7 +108,7 @@ bool torture_smb2_getinfo_scan(struct torture_context *torture)
 /* 
    scan for valid SMB2 setinfo levels
 */
-bool torture_smb2_setinfo_scan(struct torture_context *torture)
+static bool torture_smb2_setinfo_scan(struct torture_context *torture)
 {
        static const char *FNAME  = "scan-setinfo.dat";
        static const char *FNAME2 = "scan-setinfo.dat:2ndstream";
@@ -156,7 +156,7 @@ bool torture_smb2_setinfo_scan(struct torture_context *torture)
 /* 
    scan for valid SMB2 scan levels
 */
-bool torture_smb2_find_scan(struct torture_context *torture)
+static bool torture_smb2_find_scan(struct torture_context *torture)
 {
        struct smb2_tree *tree;
        NTSTATUS status;
@@ -200,7 +200,7 @@ bool torture_smb2_find_scan(struct torture_context *torture)
 /* 
    scan for valid SMB2 opcodes
 */
-bool torture_smb2_scan(struct torture_context *torture)
+static bool torture_smb2_scan(struct torture_context *torture)
 {
        TALLOC_CTX *mem_ctx = talloc_new(NULL);
        struct smb2_tree *tree;
@@ -256,3 +256,17 @@ bool torture_smb2_scan(struct torture_context *torture)
 
        return true;
 }
+
+struct torture_suite *torture_smb2_scan_init(void)
+{
+       struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "scan");
+
+       torture_suite_add_simple_test(suite, "scan", torture_smb2_scan);
+       torture_suite_add_simple_test(suite, "getinfo", torture_smb2_getinfo_scan);
+       torture_suite_add_simple_test(suite, "setinfo", torture_smb2_setinfo_scan);
+       torture_suite_add_simple_test(suite, "find", torture_smb2_find_scan);
+
+       suite->description = talloc_strdup(suite, "scan target (not a test)");
+
+       return suite;
+}

diff --git a/source4/torture/smb2/smb2.c b/source4/torture/smb2/smb2.c
index d5fc1db1527e2b160802dfbc3c4f1c4b15171756..9ea71b463efee10238d06f2824f8163c6c61adf8 100644 (file)
--- a/source4/torture/smb2/smb2.c
+++ b/source4/torture/smb2/smb2.c
@@ -140,10 +140,7 @@ NTSTATUS torture_smb2_init(void)
 {
        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_suite(suite, torture_smb2_scan_init());
        torture_suite_add_simple_test(suite, "getinfo", torture_smb2_getinfo);
        torture_suite_add_simple_test(suite, "setinfo", torture_smb2_setinfo);
        torture_suite_add_suite(suite, torture_smb2_lock_init());