smbtorture: Rename --list to --list-suites, add stub --list.

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index eb8fd8e90f33818cf00a9fc52eaa7b2b70d3db0f..f855c02b0eb4920f50bb1ce675a19b6bca581a47 100755 (executable)
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -134,7 +134,7 @@ samba4srcdir = os.path.normpath(os.path.join(os.path.dirname(os.path.abspath(__f
 builddir = os.getenv("BUILDDIR", samba4srcdir)
 samba4bindir = os.path.normpath(os.path.join(builddir, "bin"))
 smb4torture = binpath("smbtorture")
-smb4torture_testsuite_list = subprocess.Popen([smb4torture, "--list"], stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate("")[0].splitlines()
+smb4torture_testsuite_list = subprocess.Popen([smb4torture, "--list-suites"], stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate("")[0].splitlines()
 validate = os.getenv("VALIDATE", "")
 if validate:
     validate_list = [validate]

diff --git a/source4/torture/shell.c b/source4/torture/shell.c
index 4c098a97486b3e74918383dfdab66aacb7723cb5..d6cc94c6655cc56faf6b0277e55f345bdc558c20 100644 (file)
--- a/source4/torture/shell.c
+++ b/source4/torture/shell.c
@@ -215,7 +215,7 @@ static void shell_list(const struct shell_command * command,
        return;
     }
 
-    torture_print_tests(true);
+    torture_print_testsuites(true);
 }
 
 static void shell_auth(const struct shell_command * command,

diff --git a/source4/torture/smbtorture.c b/source4/torture/smbtorture.c
index 36b8c0f37773c4e234885bdc05cafd0412d1548d..dec97d22f6245d948e94cb5b29b7418fd8428164 100644 (file)
--- a/source4/torture/smbtorture.c
+++ b/source4/torture/smbtorture.c
@@ -190,7 +190,7 @@ static void parse_dns(struct loadparm_context *lp_ctx, const char *dns)
 /* Print the full test list, formatted into separate labelled test
  * groups.
  */
-static void print_structured_test_list(void)
+static void print_structured_testsuite_list(void)
 {
        struct torture_suite *o;
        struct torture_suite *s;
@@ -228,7 +228,7 @@ static void print_structured_test_list(void)
        printf("\nThe default test is ALL.\n");
 }
 
-static void print_test_list(void)
+static void print_testsuite_list(void)
 {
        struct torture_suite *o;
        struct torture_suite *s;
@@ -248,12 +248,12 @@ static void print_test_list(void)
        }
 }
 
-void torture_print_tests(bool structured)
+void torture_print_testsuites(bool structured)
 {
        if (structured) {
-               print_structured_test_list();
+               print_structured_testsuite_list();
        } else {
-               print_test_list();
+               print_testsuite_list();
        }
 }
 
@@ -311,7 +311,7 @@ _NORETURN_ static void usage(poptContext pc)
 
        printf("Tests are:");
 
-       print_structured_test_list();
+       print_structured_testsuite_list();
 
        exit(1);
 }
@@ -406,7 +406,7 @@ int main(int argc,char *argv[])
        const char *basedir = NULL;
        char *outputdir;
        const char *extra_module = NULL;
-       static int list_tests = 0;
+       static int list_tests = 0, list_testsuites = 0;
        int num_extra_users = 0;
        char **restricted = NULL;
        int num_restricted = -1;
@@ -425,7 +425,8 @@ int main(int argc,char *argv[])
                {"num-ops",       0, POPT_ARG_INT,  &torture_numops,    0,      "num ops",      NULL},
                {"entries",       0, POPT_ARG_INT,  &torture_entries,   0,      "entries",      NULL},
                {"loadfile",      0, POPT_ARG_STRING,   NULL,   OPT_LOADFILE,   "NBench load file to use",      NULL},
-               {"list",          0, POPT_ARG_NONE, &list_tests, 0, "List available tests and exit", NULL },
+               {"list-suites",           0, POPT_ARG_NONE, &list_testsuites, 0, "List available testsuites and exit", NULL },
+               {"list",          0, POPT_ARG_NONE, &list_tests, 0, "List available tests in specified suites and exit", NULL },
                {"unclist",       0, POPT_ARG_STRING,   NULL,   OPT_UNCLIST,    "unclist",      NULL},
                {"timelimit",   't', POPT_ARG_INT,      NULL,   OPT_TIMELIMIT,  "Set time limit (in seconds)",  NULL},
                {"failures",    'f', POPT_ARG_INT,  &torture_failures,  0,      "failures",     NULL},
@@ -588,8 +589,8 @@ int main(int argc,char *argv[])
                torture_init();
        }
 
-       if (list_tests) {
-               print_test_list();
+       if (list_testsuites) {
+               print_testsuite_list();
                return 0;
        }
 

diff --git a/source4/torture/smbtorture.h b/source4/torture/smbtorture.h
index 8ad58bf71cf95d75645be3603904697c71ba7e69..cbb48234e366517ec71f3d98586ced5f923b911e 100644 (file)
--- a/source4/torture/smbtorture.h
+++ b/source4/torture/smbtorture.h
@@ -37,7 +37,7 @@ struct torture_test;
 int torture_init(void);
 bool torture_register_suite(struct torture_suite *suite);
 void torture_shell(struct torture_context *tctx);
-void torture_print_tests(bool structured);
+void torture_print_testsuites(bool structured);
 bool torture_run_named_tests(struct torture_context *torture, const char *name,
                            const char **restricted);
 bool torture_parse_target(struct loadparm_context *lp_ctx, const char *target);