s4 torture: Split up the torture suite setup for RAW-SFILEINFO

A side effect of this change is that RAW-SFILEINFO now runs the whole
suite instead of just the first test.  I changed the name of the first
test to RAW-SFILEINFO-BASE and changed all of the selftest scripts
that call it.

1 files changed, 20 insertions, 6 deletions

diff --git a/source4/torture/raw/setfileinfo.c b/source4/torture/raw/setfileinfo.c
index 31c753300c..d2163629d7 100644
--- a/source4/torture/raw/setfileinfo.c
+++ b/source4/torture/raw/setfileinfo.c
@@ -29,8 +29,8 @@
    for each call we test that it succeeds, and where possible test 
    for consistency between the calls. 
 */
-bool torture_raw_sfileinfo(struct torture_context *torture, 
-			   struct smbcli_state *cli)
+static bool
+torture_raw_sfileinfo_base(struct torture_context *torture, struct smbcli_state *cli)
 {
 	bool ret = true;
 	int fnum = -1;
@@ -442,8 +442,9 @@ done:
 /*
  * basic testing of all RAW_SFILEINFO_RENAME call
  */
-bool torture_raw_sfileinfo_rename(struct torture_context *torture,
-								  struct smbcli_state *cli)
+static bool
+torture_raw_sfileinfo_rename(struct torture_context *torture,
+    struct smbcli_state *cli)
 {
 	bool ret = true;
 	int fnum_saved, d_fnum, fnum2, fnum = -1;
@@ -669,8 +670,8 @@ done:
 /* 
    look for the w2k3 setpathinfo STANDARD bug
 */
-bool torture_raw_sfileinfo_bug(struct torture_context *torture,
-							   struct smbcli_state *cli)
+static bool torture_raw_sfileinfo_bug(struct torture_context *torture,
+    struct smbcli_state *cli)
 {
 	const char *fname = "\\bug3.txt";
 	union smb_setfileinfo sfinfo;
@@ -698,3 +699,16 @@ bool torture_raw_sfileinfo_bug(struct torture_context *torture,
 
 	return true;
 }
+
+struct torture_suite *torture_raw_sfileinfo(TALLOC_CTX *mem_ctx)
+{
+	struct torture_suite *suite = torture_suite_create(mem_ctx,
+	    "SFILEINFO");
+
+	torture_suite_add_1smb_test(suite, "BASE", torture_raw_sfileinfo_base);
+	torture_suite_add_1smb_test(suite, "RENAME",
+				      torture_raw_sfileinfo_rename);
+	torture_suite_add_1smb_test(suite, "BUG", torture_raw_sfileinfo_bug);
+
+	return suite;
+}