lib/util: consolidate module loading into common code
[samba.git] / source4 / torture / smbtorture.c
index 38f91454e65ebf18e002b0658502d8fc7df130f5..81ae11253c938d55b685cc5771523df33016a4ab 100644 (file)
@@ -2,11 +2,11 @@
    Unix SMB/CIFS implementation.
    SMB torture tester
    Copyright (C) Andrew Tridgell 1997-2003
-   Copyright (C) Jelmer Vernooij 2006
+   Copyright (C) Jelmer Vernooij 2006-2008
    
    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
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -15,8 +15,7 @@
    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.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
 #include "system/time.h"
 #include "system/wait.h"
 #include "system/filesys.h"
+#include "system/readline.h"
+#include "../libcli/smbreadline/smbreadline.h"
 #include "libcli/libcli.h"
-#include "lib/ldb/include/ldb.h"
 #include "lib/events/events.h"
-#include "dynconfig.h"
 
-#include "torture/torture.h"
-#include "build.h"
-#include "lib/util/dlinklist.h"
+#include "torture/smbtorture.h"
 #include "librpc/rpc/dcerpc.h"
+#include "auth/gensec/gensec.h"
+#include "param/param.h"
+#include "lib/util/samba_modules.h"
+
+#if HAVE_READLINE_HISTORY_H
+#include <readline/history.h>
+#endif
+
+static char *prefix_name(TALLOC_CTX *mem_ctx, const char *prefix, const char *name)
+{
+       if (prefix == NULL)
+               return talloc_strdup(mem_ctx, name);
+       else
+               return talloc_asprintf(mem_ctx, "%s.%s", prefix, name);
+}
+
+static void print_test_list(const struct torture_suite *suite, const char *prefix, const char *expr)
+{
+       struct torture_suite *o;
+       struct torture_tcase *t;
+       struct torture_test *p;
+
+       for (o = suite->children; o; o = o->next) {
+               char *name = prefix_name(NULL, prefix, o->name);
+               print_test_list(o, name, expr);
+               talloc_free(name);
+       }
+
+       for (t = suite->testcases; t; t = t->next) {
+               for (p = t->tests; p; p = p->next) {
+                       char *name = talloc_asprintf(NULL, "%s.%s.%s", prefix, t->name, p->name);
+                       if (strncmp(name, expr, strlen(expr)) == 0) {
+                               printf("%s\n", name);
+                       }
+                       talloc_free(name);
+               }
+       }
+}
 
 static bool run_matching(struct torture_context *torture,
                                                 const char *prefix, 
                                                 const char *expr,
+                                                const char **restricted,
                                                 struct torture_suite *suite,
                                                 bool *matched)
 {
        bool ret = true;
-
-       if (suite == NULL) {
-               struct torture_suite *o;
-
-               for (o = torture_root->children; o; o = o->next) {
-                       if (gen_fnmatch(expr, o->name) == 0) {
-                               *matched = true;
-                               init_iconv();
+       struct torture_suite *o;
+       struct torture_tcase *t;
+       struct torture_test *p;
+
+       for (o = suite->children; o; o = o->next) {
+               char *name = NULL;
+               name = prefix_name(torture, prefix, o->name);
+               if (gen_fnmatch(expr, name) == 0) {
+                       *matched = true;
+                       reload_charcnv(torture->lp_ctx);
+                       if (restricted != NULL)
+                               ret &= torture_run_suite_restricted(torture, o, restricted);
+                       else
                                ret &= torture_run_suite(torture, o);
-                               continue;
-                       }
-
-                       ret &= run_matching(torture, o->name, expr, o, matched);
                }
-       } else {
-               char *name;
-               struct torture_suite *c;
-               struct torture_tcase *t;
-
-               for (c = suite->children; c; c = c->next) {
-                       asprintf(&name, "%s-%s", prefix, c->name);
-                       if (gen_fnmatch(expr, name) == 0) {
-                               *matched = true;
-                               init_iconv();
-                               ret &= torture_run_suite(torture, c);
-                               free(name);
-                               continue;
-                       }
-                       
-                       ret &= run_matching(torture, name, expr, c, matched);
+               ret &= run_matching(torture, name, expr, restricted, o, matched);
+       }
 
-                       free(name);
+       for (t = suite->testcases; t; t = t->next) {
+               char *name = talloc_asprintf(torture, "%s.%s", prefix, t->name);
+               if (gen_fnmatch(expr, name) == 0) {
+                       *matched = true;
+                       reload_charcnv(torture->lp_ctx);
+                       ret &= torture_run_tcase_restricted(torture, t, restricted);
                }
-
-               for (t = suite->testcases; t; t = t->next) {
-                       asprintf(&name, "%s-%s", prefix, t->name);
+               for (p = t->tests; p; p = p->next) {
+                       name = talloc_asprintf(torture, "%s.%s.%s", prefix, t->name, p->name);
                        if (gen_fnmatch(expr, name) == 0) {
                                *matched = true;
-                               init_iconv();
-                               ret &= torture_run_tcase(torture, t);
+                               reload_charcnv(torture->lp_ctx);
+                               ret &= torture_run_test_restricted(torture, t, p, restricted);
                        }
-                       free(name);
                }
        }
 
@@ -94,20 +120,27 @@ static bool run_matching(struct torture_context *torture,
 /****************************************************************************
 run a specified test or "ALL"
 ****************************************************************************/
-static bool run_test(struct torture_context *torture, const char *name)
+bool torture_run_named_tests(struct torture_context *torture, const char *name,
+                           const char **restricted)
 {
        bool ret = true;
        bool matched = false;
        struct torture_suite *o;
 
+       torture_ui_report_time(torture);
+
        if (strequal(name, "ALL")) {
+               if (restricted != NULL) {
+                       printf("--load-list and ALL are incompatible\n");
+                       return false;
+               }
                for (o = torture_root->children; o; o = o->next) {
                        ret &= torture_run_suite(torture, o);
                }
                return ret;
        }
 
-       ret = run_matching(torture, NULL, name, NULL, &matched);
+       ret = run_matching(torture, NULL, name, restricted, torture_root, &matched);
 
        if (!matched) {
                printf("Unknown torture operation '%s'\n", name);
@@ -117,7 +150,33 @@ static bool run_test(struct torture_context *torture, const char *name)
        return ret;
 }
 
-static void parse_dns(const char *dns)
+bool torture_parse_target(struct loadparm_context *lp_ctx, const char *target)
+{
+       char *host = NULL, *share = NULL;
+       struct dcerpc_binding *binding_struct;
+       NTSTATUS status;
+
+       /* see if its a RPC transport specifier */
+       if (!smbcli_parse_unc(target, NULL, &host, &share)) {
+               status = dcerpc_parse_binding(talloc_autofree_context(), target, &binding_struct);
+               if (NT_STATUS_IS_ERR(status)) {
+                       d_printf("Invalid option: %s is not a valid torture target (share or binding string)\n\n", target);
+                       return false;
+               }
+               lpcfg_set_cmdline(lp_ctx, "torture:host", binding_struct->host);
+               if (lpcfg_parm_string(lp_ctx, NULL, "torture", "share") == NULL)
+                       lpcfg_set_cmdline(lp_ctx, "torture:share", "IPC$");
+               lpcfg_set_cmdline(lp_ctx, "torture:binding", target);
+       } else {
+               lpcfg_set_cmdline(lp_ctx, "torture:host", host);
+               lpcfg_set_cmdline(lp_ctx, "torture:share", share);
+               lpcfg_set_cmdline(lp_ctx, "torture:binding", host);
+       }
+
+       return true;
+}
+
+static void parse_dns(struct loadparm_context *lp_ctx, const char *dns)
 {
        char *userdn, *basedn, *secret;
        char *p, *d;
@@ -125,45 +184,110 @@ static void parse_dns(const char *dns)
        /* retrievieng the userdn */
        p = strchr_m(dns, '#');
        if (!p) {
-               lp_set_cmdline("torture:ldap_userdn", "");
-               lp_set_cmdline("torture:ldap_basedn", "");
-               lp_set_cmdline("torture:ldap_secret", "");
+               lpcfg_set_cmdline(lp_ctx, "torture:ldap_userdn", "");
+               lpcfg_set_cmdline(lp_ctx, "torture:ldap_basedn", "");
+               lpcfg_set_cmdline(lp_ctx, "torture:ldap_secret", "");
                return;
        }
        userdn = strndup(dns, p - dns);
-       lp_set_cmdline("torture:ldap_userdn", userdn);
+       lpcfg_set_cmdline(lp_ctx, "torture:ldap_userdn", userdn);
 
        /* retrieve the basedn */
        d = p + 1;
        p = strchr_m(d, '#');
        if (!p) {
-               lp_set_cmdline("torture:ldap_basedn", "");
-               lp_set_cmdline("torture:ldap_secret", "");
+               lpcfg_set_cmdline(lp_ctx, "torture:ldap_basedn", "");
+               lpcfg_set_cmdline(lp_ctx, "torture:ldap_secret", "");
                return;
        }
        basedn = strndup(d, p - d);
-       lp_set_cmdline("torture:ldap_basedn", basedn);
+       lpcfg_set_cmdline(lp_ctx, "torture:ldap_basedn", basedn);
 
        /* retrieve the secret */
        p = p + 1;
        if (!p) {
-               lp_set_cmdline("torture:ldap_secret", "");
+               lpcfg_set_cmdline(lp_ctx, "torture:ldap_secret", "");
                return;
        }
        secret = strdup(p);
-       lp_set_cmdline("torture:ldap_secret", secret);
+       lpcfg_set_cmdline(lp_ctx, "torture:ldap_secret", secret);
 
        printf ("%s - %s - %s\n", userdn, basedn, secret);
 
 }
 
-static void usage(poptContext pc)
+/* Print the full test list, formatted into separate labelled test
+ * groups.
+ */
+static void print_structured_testsuite_list(void)
 {
        struct torture_suite *o;
        struct torture_suite *s;
        struct torture_tcase *t;
        int i;
 
+       if (torture_root == NULL) {
+           printf("NO TESTS LOADED\n");
+           return;
+       }
+
+       for (o = torture_root->children; o; o = o->next) {
+               printf("\n%s (%s):\n  ", o->description, o->name);
+
+               i = 0;
+               for (s = o->children; s; s = s->next) {
+                       if (i + strlen(o->name) + strlen(s->name) >= (MAX_COLS - 3)) {
+                               printf("\n  ");
+                               i = 0;
+                       }
+                       i+=printf("%s.%s ", o->name, s->name);
+               }
+
+               for (t = o->testcases; t; t = t->next) {
+                       if (i + strlen(o->name) + strlen(t->name) >= (MAX_COLS - 3)) {
+                               printf("\n  ");
+                               i = 0;
+                       }
+                       i+=printf("%s.%s ", o->name, t->name);
+               }
+
+               if (i) printf("\n");
+       }
+
+       printf("\nThe default test is ALL.\n");
+}
+
+static void print_testsuite_list(void)
+{
+       struct torture_suite *o;
+       struct torture_suite *s;
+       struct torture_tcase *t;
+
+       if (torture_root == NULL)
+               return;
+
+       for (o = torture_root->children; o; o = o->next) {
+               for (s = o->children; s; s = s->next) {
+                       printf("%s.%s\n", o->name, s->name);
+               }
+
+               for (t = o->testcases; t; t = t->next) {
+                       printf("%s.%s\n", o->name, t->name);
+               }
+       }
+}
+
+void torture_print_testsuites(bool structured)
+{
+       if (structured) {
+               print_structured_testsuite_list();
+       } else {
+               print_testsuite_list();
+       }
+}
+
+static void usage(poptContext pc)
+{
        poptPrintUsage(pc, stdout, 0);
        printf("\n");
 
@@ -216,47 +340,11 @@ static void usage(poptContext pc)
 
        printf("Tests are:");
 
-       for (o = torture_root->children; o; o = o->next) {
-               printf("\n%s (%s):\n  ", o->description, o->name);
-
-               i = 0;
-               for (s = o->children; s; s = s->next) {
-                       if (i + strlen(o->name) + strlen(s->name) >= (MAX_COLS - 3)) {
-                               printf("\n  ");
-                               i = 0;
-                       }
-                       i+=printf("%s-%s ", o->name, s->name);
-               }
-
-               for (t = o->testcases; t; t = t->next) {
-                       if (i + strlen(o->name) + strlen(t->name) >= (MAX_COLS - 3)) {
-                               printf("\n  ");
-                               i = 0;
-                       }
-                       i+=printf("%s-%s ", o->name, t->name);
-               }
-
-               if (i) printf("\n");
-       }
-
-       printf("\nThe default test is ALL.\n");
-
-       exit(1);
-}
-
-static bool is_binding_string(const char *binding_string)
-{
-       TALLOC_CTX *mem_ctx = talloc_named_const(NULL, 0, "is_binding_string");
-       struct dcerpc_binding *binding_struct;
-       NTSTATUS status;
-       
-       status = dcerpc_parse_binding(mem_ctx, binding_string, &binding_struct);
+       print_structured_testsuite_list();
 
-       talloc_free(mem_ctx);
-       return NT_STATUS_IS_OK(status);
 }
 
-static void max_runtime_handler(int sig)
+_NORETURN_ static void max_runtime_handler(int sig)
 {
        DEBUG(0,("maximum runtime exceeded for smbtorture - terminating\n"));
        exit(1);
@@ -265,22 +353,22 @@ static void max_runtime_handler(int sig)
 struct timeval last_suite_started;
 
 static void simple_suite_start(struct torture_context *ctx,
-                                                          struct torture_suite *suite)
+                              struct torture_suite *suite)
 {
        last_suite_started = timeval_current();
        printf("Running %s\n", suite->name);
 }
 
 static void simple_suite_finish(struct torture_context *ctx,
-                                                          struct torture_suite *suite)
+                               struct torture_suite *suite)
 {
 
        printf("%s took %g secs\n\n", suite->name, 
                   timeval_elapsed(&last_suite_started));
 }
 
-static void simple_test_result (struct torture_context *context, 
-                                                               enum torture_result res, const char *reason)
+static void simple_test_result(struct torture_context *context, 
+                              enum torture_result res, const char *reason)
 {
        switch (res) {
        case TORTURE_OK:
@@ -299,165 +387,82 @@ static void simple_test_result (struct torture_context *context,
        }
 }
 
-static void simple_comment (struct torture_context *test, 
-                                                       const char *comment)
+static void simple_comment(struct torture_context *test, 
+                          const char *comment)
 {
        printf("%s", comment);
 }
 
-const static struct torture_ui_ops std_ui_ops = {
-       .comment = simple_comment,
-       .suite_start = simple_suite_start,
-       .suite_finish = simple_suite_finish,
-       .test_result = simple_test_result
-};
-
-
-static void subunit_test_start (struct torture_context *ctx, 
-                                                           struct torture_tcase *tcase,
-                                                               struct torture_test *test)
-{
-       printf("test: %s\n", test->name);
-}
-
-static void subunit_test_result (struct torture_context *context, 
-                                                                enum torture_result res, const char *reason)
+static void simple_warning(struct torture_context *test, 
+                          const char *comment)
 {
-       switch (res) {
-       case TORTURE_OK:
-               printf("success: %s", context->active_test->name);
-               break;
-       case TORTURE_FAIL:
-               printf("failure: %s", context->active_test->name);
-               break;
-       case TORTURE_ERROR:
-               printf("error: %s", context->active_test->name);
-               break;
-       case TORTURE_SKIP:
-               printf("skip: %s", context->active_test->name);
-               break;
-       }
-       if (reason)
-               printf(" [ %s ]", reason);
-       printf("\n");
+       fprintf(stderr, "WARNING: %s\n", comment);
 }
 
-static void subunit_comment (struct torture_context *test, 
-                                                        const char *comment)
+static void simple_progress(struct torture_context *test,
+       int offset, enum torture_progress_whence whence)
 {
-       fprintf(stderr, "%s", comment);
 }
 
-const static struct torture_ui_ops subunit_ui_ops = {
-       .comment = subunit_comment,
-       .test_start = subunit_test_start,
-       .test_result = subunit_test_result
-};
-
-static void harness_test_start (struct torture_context *ctx, 
-                                                           struct torture_tcase *tcase,
-                                                               struct torture_test *test)
-{
-}
-
-static void harness_test_result (struct torture_context *context, 
-                                                                enum torture_result res, const char *reason)
-{
-       switch (res) {
-       case TORTURE_OK:
-               printf("ok %s - %s\n", context->active_test->name, reason);
-               break;
-       case TORTURE_FAIL:
-       case TORTURE_ERROR:
-               printf("not ok %s - %s\n", context->active_test->name, reason);
-               break;
-       case TORTURE_SKIP:
-               printf("skip %s - %s\n", context->active_test->name, reason);
-               break;
-       }
-}
-
-static void harness_comment (struct torture_context *test, 
-                                                        const char *comment)
-{
-       printf("# %s\n", comment);
-}
-
-const static struct torture_ui_ops harness_ui_ops = {
-       .comment = harness_comment,
-       .test_start = harness_test_start,
-       .test_result = harness_test_result
-};
-
-static void quiet_suite_start(struct torture_context *ctx,
-                                                 struct torture_suite *suite)
-{
-       int i;
-       ctx->quiet = true;
-       for (i = 1; i < ctx->level; i++) putchar('\t');
-       printf("%s: ", suite->name);
-       fflush(stdout);
-}
-
-static void quiet_suite_finish(struct torture_context *ctx,
-                                                 struct torture_suite *suite)
-{
-       putchar('\n');
-}
-
-static void quiet_test_result (struct torture_context *context, 
-                                                          enum torture_result res, const char *reason)
-{
-       fflush(stdout);
-       switch (res) {
-       case TORTURE_OK: putchar('.'); break;
-       case TORTURE_FAIL: putchar('F'); break;
-       case TORTURE_ERROR: putchar('E'); break;
-       case TORTURE_SKIP: putchar('I'); break;
-       }
-}
-
-const static struct torture_ui_ops quiet_ui_ops = {
-       .suite_start = quiet_suite_start,
-       .suite_finish = quiet_suite_finish,
-       .test_result = quiet_test_result
+const static struct torture_ui_ops std_ui_ops = {
+       .comment = simple_comment,
+       .warning = simple_warning,
+       .suite_start = simple_suite_start,
+       .suite_finish = simple_suite_finish,
+       .test_result = simple_test_result,
+       .progress = simple_progress,
 };
 
-
 /****************************************************************************
   main program
 ****************************************************************************/
- int main(int argc,char *argv[])
+int main(int argc,char *argv[])
 {
        int opt, i;
        bool correct = true;
        int max_runtime=0;
        int argc_new;
        struct torture_context *torture;
+       struct torture_results *results;
        const struct torture_ui_ops *ui_ops;
        char **argv_new;
        poptContext pc;
        static const char *target = "other";
-       const char **subunit_dir;
-       static const char *ui_ops_name = "simple";
-       enum {OPT_LOADFILE=1000,OPT_UNCLIST,OPT_TIMELIMIT,OPT_DNS,
-             OPT_DANGEROUS,OPT_SMB_PORTS,OPT_ASYNC};
-       
+       NTSTATUS status;
+       int shell = false;
+       static const char *ui_ops_name = "subunit";
+       const char *basedir = NULL;
+       char *outputdir;
+       const char *extra_module = NULL;
+       static int list_tests = 0, list_testsuites = 0;
+       int num_extra_users = 0;
+       char **restricted = NULL;
+       int num_restricted = -1;
+       const char *load_list = NULL;
+       enum {OPT_LOADFILE=1000,OPT_UNCLIST,OPT_TIMELIMIT,OPT_DNS, OPT_LIST,
+             OPT_DANGEROUS,OPT_SMB_PORTS,OPT_ASYNC,OPT_NUMPROGS,
+             OPT_EXTRA_USER,};
+
        struct poptOption long_options[] = {
                POPT_AUTOHELP
-               {"format", 0, POPT_ARG_STRING, &ui_ops_name, 0, "Output format (one of: simple, subunit, harness)", NULL },
+               {"format", 0, POPT_ARG_STRING, &ui_ops_name, 0, "Output format (one of: simple, subunit)", NULL },
                {"smb-ports",   'p', POPT_ARG_STRING, NULL,     OPT_SMB_PORTS,  "SMB ports",    NULL},
-               {"seed",          0, POPT_ARG_INT,  &torture_seed,      0,      "seed",         NULL},
+               {"basedir",       0, POPT_ARG_STRING, &basedir, 0, "base directory", "BASEDIR" },
+               {"seed",          0, POPT_ARG_INT,  &torture_seed,      0,      "Seed to use for randomizer",   NULL},
+               {"num-progs",     0, POPT_ARG_INT,  NULL,       OPT_NUMPROGS,   "num progs",    NULL},
                {"num-ops",       0, POPT_ARG_INT,  &torture_numops,    0,      "num ops",      NULL},
                {"entries",       0, POPT_ARG_INT,  &torture_entries,   0,      "entries",      NULL},
-               {"show-all",      0, POPT_ARG_NONE, &torture_showall,   0,      "show all",     NULL},
-               {"loadfile",      0, POPT_ARG_STRING,   NULL,   OPT_LOADFILE,   "loadfile",     NULL},
+               {"loadfile",      0, POPT_ARG_STRING,   NULL,   OPT_LOADFILE,   "NBench load file to use",      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_STRING,   NULL,   OPT_TIMELIMIT,  "timelimit",    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},
                {"parse-dns",   'D', POPT_ARG_STRING,   NULL,   OPT_DNS,        "parse-dns",    NULL},
                {"dangerous",   'X', POPT_ARG_NONE,     NULL,   OPT_DANGEROUS,
                 "run dangerous tests (eg. wiping out password database)", NULL},
+               {"load-module",  0,  POPT_ARG_STRING, &extra_module,     0, "load tests from DSO file",    "SOFILE"},
+                {"shell",               0, POPT_ARG_NONE, &shell, true, "Run shell", NULL},
                {"target",              'T', POPT_ARG_STRING, &target, 0, "samba3|samba4|other", NULL},
                {"async",       'a', POPT_ARG_NONE,     NULL,   OPT_ASYNC,
                 "run async tests", NULL},
@@ -465,6 +470,10 @@ const static struct torture_ui_ops quiet_ui_ops = {
                 "number of simultaneous async requests", NULL},
                {"maximum-runtime", 0, POPT_ARG_INT, &max_runtime, 0, 
                 "set maximum time for smbtorture to live", "seconds"},
+               {"extra-user",   0, POPT_ARG_STRING, NULL, OPT_EXTRA_USER,
+                "extra user credentials", NULL},
+               {"load-list", 0, POPT_ARG_STRING, &load_list, 0,
+            "load a test id list from a text file", NULL},
                POPT_COMMON_SAMBA
                POPT_COMMON_CONNECTION
                POPT_COMMON_CREDENTIALS
@@ -475,7 +484,7 @@ const static struct torture_ui_ops quiet_ui_ops = {
        setlinebuf(stdout);
 
        /* we are never interested in SIGPIPE */
-       BlockSignals(true,SIGPIPE);
+       BlockSignals(true, SIGPIPE);
 
        pc = poptGetContext("smbtorture", argc, (const char **) argv, long_options, 
                            POPT_CONTEXT_KEEP_FIRST);
@@ -485,41 +494,101 @@ const static struct torture_ui_ops quiet_ui_ops = {
        while((opt = poptGetNextOpt(pc)) != -1) {
                switch (opt) {
                case OPT_LOADFILE:
-                       lp_set_cmdline("torture:loadfile", poptGetOptArg(pc));
+                       lpcfg_set_cmdline(cmdline_lp_ctx, "torture:loadfile", poptGetOptArg(pc));
                        break;
                case OPT_UNCLIST:
-                       lp_set_cmdline("torture:unclist", poptGetOptArg(pc));
+                       lpcfg_set_cmdline(cmdline_lp_ctx, "torture:unclist", poptGetOptArg(pc));
                        break;
                case OPT_TIMELIMIT:
-                       lp_set_cmdline("torture:timelimit", poptGetOptArg(pc));
+                       lpcfg_set_cmdline(cmdline_lp_ctx, "torture:timelimit", poptGetOptArg(pc));
+                       break;
+               case OPT_NUMPROGS:
+                       lpcfg_set_cmdline(cmdline_lp_ctx, "torture:nprocs", poptGetOptArg(pc));
                        break;
                case OPT_DNS:
-                       parse_dns(poptGetOptArg(pc));
+                       parse_dns(cmdline_lp_ctx, poptGetOptArg(pc));
                        break;
                case OPT_DANGEROUS:
-                       lp_set_cmdline("torture:dangerous", "Yes");
+                       lpcfg_set_cmdline(cmdline_lp_ctx, "torture:dangerous", "Yes");
                        break;
                case OPT_ASYNC:
-                       lp_set_cmdline("torture:async", "Yes");
+                       lpcfg_set_cmdline(cmdline_lp_ctx, "torture:async", "Yes");
                        break;
                case OPT_SMB_PORTS:
-                       lp_set_cmdline("smb ports", poptGetOptArg(pc));
+                       lpcfg_set_cmdline(cmdline_lp_ctx, "smb ports", poptGetOptArg(pc));
+                       break;
+               case OPT_EXTRA_USER:
+                       {
+                               char *option = talloc_asprintf(NULL, "torture:extra_user%u",
+                                                              ++num_extra_users);
+                               const char *value = poptGetOptArg(pc);
+                               lpcfg_set_cmdline(cmdline_lp_ctx, option, value);
+                               talloc_free(option);
+                       }
                        break;
                default:
-                       d_printf("Invalid option %s: %s\n", 
-                                poptBadOption(pc, 0), poptStrerror(opt));
-                       torture_init();
-                       usage(pc);
+                       if (opt < 0) {
+                               printf("bad command line option %d\n", opt);
+                               exit(1);
+                       }
+               }
+       }
+
+       if (load_list != NULL) {
+               restricted = file_lines_load(load_list, &num_restricted, 0,
+                                                                        talloc_autofree_context());
+               if (restricted == NULL) {
+                       printf("Unable to read load list file '%s'\n", load_list);
                        exit(1);
                }
        }
 
        if (strcmp(target, "samba3") == 0) {
-               lp_set_cmdline("torture:samba3", "true");
-               lp_set_cmdline("torture:knownfail", "samba3-knownfail");
+               lpcfg_set_cmdline(cmdline_lp_ctx, "torture:samba3", "true");
+               lpcfg_set_cmdline(cmdline_lp_ctx, "torture:resume_key_support", "false");
        } else if (strcmp(target, "samba4") == 0) {
-               lp_set_cmdline("torture:samba4", "true");
-               lp_set_cmdline("torture:knownfail", "samba4-knownfail");
+               lpcfg_set_cmdline(cmdline_lp_ctx, "torture:samba4", "true");
+       } else if (strcmp(target, "winxp") == 0) {
+               lpcfg_set_cmdline(cmdline_lp_ctx, "torture:winxp", "true");
+       } else if (strcmp(target, "w2k3") == 0) {
+               lpcfg_set_cmdline(cmdline_lp_ctx, "torture:w2k3", "true");
+       } else if (strcmp(target, "w2k8") == 0) {
+               lpcfg_set_cmdline(cmdline_lp_ctx, "torture:w2k8", "true");
+               lpcfg_set_cmdline(cmdline_lp_ctx,
+                   "torture:invalid_lock_range_support", "false");
+       } else if (strcmp(target, "win7") == 0) {
+               lpcfg_set_cmdline(cmdline_lp_ctx, "torture:win7", "true");
+               lpcfg_set_cmdline(cmdline_lp_ctx, "torture:cn_max_buffer_size",
+                   "0x00010000");
+               lpcfg_set_cmdline(cmdline_lp_ctx, "torture:resume_key_support", "false");
+               lpcfg_set_cmdline(cmdline_lp_ctx, "torture:rewind_support", "false");
+
+               /* RAW-SEARCH for fails for inexplicable reasons against win7 */
+               lpcfg_set_cmdline(cmdline_lp_ctx, "torture:search_ea_support", "false");
+
+               lpcfg_set_cmdline(cmdline_lp_ctx, "torture:hide_on_access_denied",
+                   "true");
+       } else if (strcmp(target, "onefs") == 0) {
+               lpcfg_set_cmdline(cmdline_lp_ctx, "torture:onefs", "true");
+               lpcfg_set_cmdline(cmdline_lp_ctx, "torture:openx_deny_dos_support",
+                   "false");
+               lpcfg_set_cmdline(cmdline_lp_ctx, "torture:range_not_locked_on_file_close", "false");
+               lpcfg_set_cmdline(cmdline_lp_ctx, "torture:sacl_support", "false");
+               lpcfg_set_cmdline(cmdline_lp_ctx, "torture:ea_support", "false");
+               lpcfg_set_cmdline(cmdline_lp_ctx, "torture:smbexit_pdu_support",
+                   "false");
+               lpcfg_set_cmdline(cmdline_lp_ctx, "torture:smblock_pdu_support",
+                   "false");
+               lpcfg_set_cmdline(cmdline_lp_ctx, "torture:2_step_break_to_none",
+                   "true");
+               lpcfg_set_cmdline(cmdline_lp_ctx, "torture:deny_dos_support", "false");
+               lpcfg_set_cmdline(cmdline_lp_ctx, "torture:deny_fcb_support", "false");
+               lpcfg_set_cmdline(cmdline_lp_ctx, "torture:read_support", "false");
+               lpcfg_set_cmdline(cmdline_lp_ctx, "torture:writeclose_support", "false");
+               lpcfg_set_cmdline(cmdline_lp_ctx, "torture:resume_key_support", "false");
+               lpcfg_set_cmdline(cmdline_lp_ctx, "torture:rewind_support", "false");
+               lpcfg_set_cmdline(cmdline_lp_ctx, "torture:raw_search_search", "false");
+               lpcfg_set_cmdline(cmdline_lp_ctx, "torture:search_ea_size", "false");
        }
 
        if (max_runtime) {
@@ -532,22 +601,26 @@ const static struct torture_ui_ops quiet_ui_ops = {
                alarm(max_runtime);
        }
 
-       torture_init();
-       ldb_global_init();
+       if (extra_module != NULL) {
+           init_module_fn fn = load_module(talloc_autofree_context(), poptGetOptArg(pc));
 
-       subunit_dir = lp_parm_string_list(-1, "torture", "subunitdir", ":");
-       if (subunit_dir == NULL) 
-               torture_subunit_load_testsuites(dyn_TORTUREDIR, true, NULL);
-       else {
-               for (i = 0; subunit_dir[i]; i++)
-                       torture_subunit_load_testsuites(subunit_dir[i], true, NULL);
+               if (fn == NULL) 
+                       d_printf("Unable to load module from %s\n", poptGetOptArg(pc));
+               else {
+                       status = fn();
+                       if (NT_STATUS_IS_ERR(status)) {
+                               d_printf("Error initializing module %s: %s\n", 
+                                       poptGetOptArg(pc), nt_errstr(status));
+                       }
+               }
+       } else { 
+               torture_init();
        }
 
-       if (torture_seed == 0) {
-               torture_seed = time(NULL);
-       } 
-       printf("Using seed %d\n", torture_seed);
-       srandom(torture_seed);
+       if (list_testsuites) {
+               print_testsuite_list();
+               return 0;
+       }
 
        argv_new = discard_const_p(char *, poptGetArgs(pc));
 
@@ -559,100 +632,95 @@ const static struct torture_ui_ops quiet_ui_ops = {
                }
        }
 
-       if (argc_new < 3) {
-               usage(pc);
-               exit(1);
-       }
-
-       /* see if its a RPC transport specifier */
-       if (is_binding_string(argv_new[1])) {
-               lp_set_cmdline("torture:binding", argv_new[1]);
-       } else {
-               char *binding = NULL;
-               char *host = NULL, *share = NULL;
-
-               if (!smbcli_parse_unc(argv_new[1], NULL, &host, &share)) {
-                       d_printf("Invalid option: %s is not a valid torture target (share or binding string)\n\n", argv_new[1]);
-                       usage(pc);
+       if (list_tests) {
+               if (argc_new == 1) {
+                       print_test_list(torture_root, NULL, "");
+               } else {
+                       for (i=1;i<argc_new;i++) {
+                               print_test_list(torture_root, NULL, argv_new[i]);
+                       }
                }
-
-               lp_set_cmdline("torture:host", host);
-               lp_set_cmdline("torture:share", share);
-               asprintf(&binding, "ncacn_np:%s", host);
-               lp_set_cmdline("torture:binding", binding);
+               return 0;
        }
 
+       if (torture_seed == 0) {
+               torture_seed = time(NULL);
+       } 
+       printf("Using seed %d\n", torture_seed);
+       srandom(torture_seed);
+
        if (!strcmp(ui_ops_name, "simple")) {
                ui_ops = &std_ui_ops;
        } else if (!strcmp(ui_ops_name, "subunit")) {
-               ui_ops = &subunit_ui_ops;
-       } else if (!strcmp(ui_ops_name, "harness")) {
-               ui_ops = &harness_ui_ops;
-       } else if (!strcmp(ui_ops_name, "quiet")) {
-               ui_ops = &quiet_ui_ops;
+               ui_ops = &torture_subunit_ui_ops;
        } else {
                printf("Unknown output format '%s'\n", ui_ops_name);
                exit(1);
        }
 
-       torture = torture_context_init(talloc_autofree_context(), 
-                               lp_parm_string(-1, "torture", "knownfail"), ui_ops);
+       results = torture_results_init(talloc_autofree_context(), ui_ops);
 
-       if (argc_new == 0) {
-               printf("You must specify a test to run, or 'ALL'\n");
+       torture = torture_context_init(s4_event_context_init(talloc_autofree_context()),
+                                      results);
+       if (basedir != NULL) {
+               if (basedir[0] != '/') {
+                       fprintf(stderr, "Please specify an absolute path to --basedir\n");
+                       return 1;
+               }
+               outputdir = talloc_asprintf(torture, "%s/smbtortureXXXXXX", basedir);
        } else {
-               int total;
-               double rate;
-               int unexpected_failures;
-               for (i=2;i<argc_new;i++) {
-                       if (!run_test(torture, argv_new[i])) {
-                               correct = false;
-                       }
+               char *pwd = talloc_size(torture, PATH_MAX);
+               if (!getcwd(pwd, PATH_MAX)) {
+                       fprintf(stderr, "Unable to determine current working directory\n");
+                       return 1;
                }
+               outputdir = talloc_asprintf(torture, "%s/smbtortureXXXXXX", pwd);
+       }
+       if (!outputdir) {
+               fprintf(stderr, "Could not allocate per-run output dir\n");
+               return 1;
+       }
+       torture->outputdir = mkdtemp(outputdir);
+       if (!torture->outputdir) {
+               perror("Failed to make temp output dir");
+       }
 
+       torture->lp_ctx = cmdline_lp_ctx;
 
-               unexpected_failures = str_list_length(torture->results.unexpected_failures);
-
-               total = torture->results.skipped+torture->results.success+torture->results.failed+torture->results.errors;
-               if (total == 0) {
-                       printf("No tests run.\n");
-               } else {
-                       rate = ((total - unexpected_failures - torture->results.errors) * (100.0 / total));
-               
-                       printf("Tests: %d, Failures: %d", total, torture->results.failed);
-                       if (torture->results.failed - unexpected_failures) {
-                               printf(" (%d expected)", torture->results.failed - unexpected_failures);
-                       }
-                       printf(", Errors: %d, Skipped: %d. Success rate: %.2f%%\n",
-                          torture->results.errors, torture->results.skipped, rate);
-               }
+       gensec_init();
 
-               if (unexpected_failures) {
-                       printf("The following tests failed:\n");
-                       for (i = 0; torture->results.unexpected_failures[i]; i++) {
-                               printf("  %s\n", torture->results.unexpected_failures[i]);
-                       }
-                       printf("\n");
-               }
+       if (shell) {
+               /* In shell mode, just ignore any remaining test names. */
+               torture_shell(torture);
+       } else {
 
-               if (str_list_length(torture->results.unexpected_errors)) {
-                       printf("Errors occurred while running the following tests:\n");
-                       for (i = 0; torture->results.unexpected_errors[i]; i++) {
-                               printf("  %s\n", torture->results.unexpected_errors[i]);
-                       }
-                       printf("\n");
-               }
+               /* At this point, we should just have a target string,
+                * followed by a series of test names. Unless we are in
+                * shell mode, in which case we don't need anythig more.
+                */
 
-               if (str_list_length(torture->results.unexpected_successes)) {
-                       printf("The following tests were expected to fail but succeeded:\n");
-                       for (i = 0; torture->results.unexpected_successes[i]; i++) {
-                               printf("  %s\n", torture->results.unexpected_successes[i]);
+               if (argc_new < 3) {
+                       printf("You must specify a test to run, or 'ALL'\n");
+                       usage(pc);
+                       torture->results->returncode = 1;
+               } else if (!torture_parse_target(cmdline_lp_ctx, argv_new[1])) {
+               /* Take the target name or binding. */
+                       usage(pc);
+                       torture->results->returncode = 1;
+               } else {
+                       for (i=2;i<argc_new;i++) {
+                               if (!torture_run_named_tests(torture, argv_new[i],
+                                           (const char **)restricted)) {
+                                       correct = false;
+                               }
                        }
-                       printf("\n");
                }
        }
 
-       if (torture->results.returncode) {
+       /* Now delete the temp dir we created */
+       torture_deltree_outputdir(torture);
+
+       if (torture->results->returncode && correct) {
                return(0);
        } else {
                return(1);