X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=source%2Ftorture%2Fsmbtorture.c;h=a148081fb3b9f8300464355eae588ef1531f8aa2;hb=abe8349f9b4387961ff3665d8c589d61cd2edf31;hp=d83d1310ae2798af8c6bc041e1b2c1648926488c;hpb=0c26c2aefdb603c5ffc87e9c0db0e9b2b34ec0ab;p=jelmer%2Fsamba4-debian.git diff --git a/source/torture/smbtorture.c b/source/torture/smbtorture.c index d83d1310a..a148081fb 100644 --- a/source/torture/smbtorture.c +++ b/source/torture/smbtorture.c @@ -6,7 +6,7 @@ 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 . */ #include "includes.h" @@ -24,6 +23,8 @@ #include "system/time.h" #include "system/wait.h" #include "system/filesys.h" +#include "system/readline.h" +#include "lib/smbreadline/smbreadline.h" #include "libcli/libcli.h" #include "lib/ldb/include/ldb.h" #include "lib/events/events.h" @@ -33,6 +34,7 @@ #include "build.h" #include "lib/util/dlinklist.h" #include "librpc/rpc/dcerpc.h" +#include "param/param.h" static bool run_matching(struct torture_context *torture, const char *prefix, @@ -53,8 +55,7 @@ static bool run_matching(struct torture_context *torture, continue; } - ret &= run_matching(torture, - o->name, expr, o, matched); + ret &= run_matching(torture, o->name, expr, o, matched); } } else { char *name; @@ -63,9 +64,11 @@ static bool run_matching(struct torture_context *torture, 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(); + torture->active_testname = talloc_strdup(torture, prefix); ret &= torture_run_suite(torture, c); free(name); continue; @@ -81,7 +84,9 @@ static bool run_matching(struct torture_context *torture, if (gen_fnmatch(expr, name) == 0) { *matched = true; init_iconv(); + torture->active_testname = talloc_strdup(torture, prefix); ret &= torture_run_tcase(torture, t); + talloc_free(torture->active_testname); } free(name); } @@ -158,7 +163,24 @@ static void parse_dns(const char *dns) } -static void usage(poptContext pc) +static void print_test_list(void) +{ + struct torture_suite *o; + struct torture_suite *s; + struct torture_tcase *t; + + 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); + } + } +} + +_NORETURN_ static void usage(poptContext pc) { struct torture_suite *o; struct torture_suite *s; @@ -217,6 +239,11 @@ static void usage(poptContext pc) printf("Tests are:"); + if (torture_root == NULL) { + printf("NO TESTS LOADED\n"); + exit(1); + } + for (o = torture_root->children; o; o = o->next) { printf("\n%s (%s):\n ", o->description, o->name); @@ -245,19 +272,7 @@ static void usage(poptContext pc) 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); - - 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); @@ -291,13 +306,12 @@ static void simple_test_result (struct torture_context *context, case TORTURE_FAIL: printf("TEST %s FAILED! - %s\n", context->active_test->name, reason); break; - case TORTURE_TODO: - printf("TODO: %s - %s\n", context->active_test->name, reason); + case TORTURE_ERROR: + printf("ERROR IN TEST %s! - %s\n", context->active_test->name, reason); break; case TORTURE_SKIP: printf("SKIP: %s - %s\n", context->active_test->name, reason); break; - } } @@ -307,13 +321,29 @@ static void simple_comment (struct torture_context *test, printf("%s", comment); } +static void simple_warning(struct torture_context *test, + const char *comment) +{ + fprintf(stderr, "WARNING: %s\n", comment); +} + 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 }; +static void subunit_init(struct torture_context *ctx) +{ + /* FIXME: register segv and bus handler */ +} + +static void subunit_suite_start(struct torture_context *ctx, + struct torture_suite *suite) +{ +} static void subunit_test_start (struct torture_context *ctx, struct torture_tcase *tcase, @@ -332,15 +362,15 @@ static void subunit_test_result (struct torture_context *context, case TORTURE_FAIL: printf("failure: %s", context->active_test->name); break; - case TORTURE_TODO: - printf("todo: %s", context->active_test->name); + 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%s\n]", reason); printf("\n"); } @@ -351,46 +381,11 @@ static void subunit_comment (struct torture_context *test, } const static struct torture_ui_ops subunit_ui_ops = { + .init = subunit_init, .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: - printf("not ok %s - %s\n", context->active_test->name, reason); - break; - case TORTURE_TODO: - printf("todo %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 + .test_result = subunit_test_result, + .suite_start = subunit_suite_start }; static void quiet_suite_start(struct torture_context *ctx, @@ -415,9 +410,9 @@ static void quiet_test_result (struct torture_context *context, fflush(stdout); switch (res) { case TORTURE_OK: putchar('.'); break; - case TORTURE_FAIL: putchar('E'); break; - case TORTURE_TODO: putchar('T'); break; - case TORTURE_SKIP: putchar('S'); break; + case TORTURE_FAIL: putchar('F'); break; + case TORTURE_ERROR: putchar('E'); break; + case TORTURE_SKIP: putchar('I'); break; } } @@ -427,41 +422,95 @@ const static struct torture_ui_ops quiet_ui_ops = { .test_result = quiet_test_result }; +void run_shell(struct torture_context *tctx) +{ + char *cline; + int argc; + const char **argv; + int ret; + + while (1) { + cline = smb_readline("torture> ", NULL, NULL); + + if (cline == NULL) + return; + + ret = poptParseArgvString(cline, &argc, &argv); + if (ret != 0) { + fprintf(stderr, "Error parsing line\n"); + continue; + } + + if (!strcmp(argv[0], "quit")) { + return; + } else if (!strcmp(argv[0], "set")) { + if (argc < 3) { + fprintf(stderr, "Usage: set \n"); + } else { + char *name = talloc_asprintf(NULL, "torture:%s", argv[1]); + lp_set_cmdline(name, argv[2]); + talloc_free(name); + } + } else if (!strcmp(argv[0], "help")) { + fprintf(stderr, "Available commands:\n" + " help - This help command\n" + " run - Run test\n" + " set - Change variables\n" + "\n"); + } else if (!strcmp(argv[0], "run")) { + if (argc < 2) { + fprintf(stderr, "Usage: run TEST-NAME [OPTIONS...]\n"); + } else { + run_test(tctx, argv[1]); + } + } + } +} /**************************************************************************** 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; + const struct torture_ui_ops *ui_ops; char **argv_new; poptContext pc; static const char *target = "other"; - const char **subunit_dir; + struct dcerpc_binding *binding_struct; + NTSTATUS status; + int shell = False; static const char *ui_ops_name = "simple"; - enum {OPT_LOADFILE=1000,OPT_UNCLIST,OPT_TIMELIMIT,OPT_DNS, - OPT_DANGEROUS,OPT_SMB_PORTS,OPT_ASYNC}; + const char *basedir = NULL; + const char *extra_module = NULL; + static int list_tests = 0; + char *host = NULL, *share = NULL; + enum {OPT_LOADFILE=1000,OPT_UNCLIST,OPT_TIMELIMIT,OPT_DNS, OPT_LIST, + OPT_DANGEROUS,OPT_SMB_PORTS,OPT_ASYNC,OPT_NUMPROGS}; 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}, + {"basedir", 0, POPT_ARG_STRING, &basedir, 0, "base directory", "BASEDIR" }, {"seed", 0, POPT_ARG_INT, &torture_seed, 0, "seed", NULL}, - {"num-progs", 0, POPT_ARG_INT, &torture_nprocs, 0, "num progs", 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}, + {"list", 0, POPT_ARG_NONE, &list_tests, 0, NULL, 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, "timelimit", 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}, @@ -479,7 +528,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); @@ -497,6 +546,9 @@ const static struct torture_ui_ops quiet_ui_ops = { case OPT_TIMELIMIT: lp_set_cmdline("torture:timelimit", poptGetOptArg(pc)); break; + case OPT_NUMPROGS: + lp_set_cmdline("torture:nprocs", poptGetOptArg(pc)); + break; case OPT_DNS: parse_dns(poptGetOptArg(pc)); break; @@ -509,19 +561,13 @@ const static struct torture_ui_ops quiet_ui_ops = { case OPT_SMB_PORTS: lp_set_cmdline("smb ports", poptGetOptArg(pc)); break; - default: - d_printf("Invalid option %s: %s\n", - poptBadOption(pc, 0), poptStrerror(opt)); - torture_init(); - usage(pc); - exit(1); } } if (strcmp(target, "samba3") == 0) { - lp_set_cmdline("target:samba3", "true"); + lp_set_cmdline("torture:samba3", "true"); } else if (strcmp(target, "samba4") == 0) { - lp_set_cmdline("target:samba4", "true"); + lp_set_cmdline("torture:samba4", "true"); } if (max_runtime) { @@ -534,15 +580,27 @@ const static struct torture_ui_ops quiet_ui_ops = { alarm(max_runtime); } - torture_init(); ldb_global_init(); - 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 (extra_module != NULL) { + init_module_fn fn = load_module(talloc_autofree_context(), poptGetOptArg(pc)); + + 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 (list_tests) { + print_test_list(); + return 0; } if (torture_seed == 0) { @@ -561,68 +619,68 @@ const static struct torture_ui_ops quiet_ui_ops = { } } - if (argc_new < 3) { + if (!(argc_new >= 3 || (shell && argc_new >= 2))) { 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)) { + if (!smbcli_parse_unc(argv_new[1], NULL, &host, &share)) { + status = dcerpc_parse_binding(talloc_autofree_context(), argv_new[1], &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", argv_new[1]); usage(pc); + return false; } - + lp_set_cmdline("torture:host", binding_struct->host); + lp_set_cmdline("torture:share", "IPC$"); + lp_set_cmdline("torture:binding", argv_new[1]); + } else { lp_set_cmdline("torture:host", host); lp_set_cmdline("torture:share", share); - asprintf(&binding, "ncacn_np:%s", host); - lp_set_cmdline("torture:binding", binding); + lp_set_cmdline("torture:binding", host); } - torture = talloc_zero(talloc_autofree_context(), struct torture_context); if (!strcmp(ui_ops_name, "simple")) { - torture->ui_ops = &std_ui_ops; + ui_ops = &std_ui_ops; } else if (!strcmp(ui_ops_name, "subunit")) { - torture->ui_ops = &subunit_ui_ops; - } else if (!strcmp(ui_ops_name, "harness")) { - torture->ui_ops = &harness_ui_ops; + ui_ops = &subunit_ui_ops; } else if (!strcmp(ui_ops_name, "quiet")) { - torture->ui_ops = &quiet_ui_ops; + ui_ops = &quiet_ui_ops; } else { printf("Unknown output format '%s'\n", ui_ops_name); exit(1); } + torture = torture_context_init(talloc_autofree_context(), ui_ops); + if (basedir != NULL) { + if (basedir[0] != '/') { + fprintf(stderr, "Please specify an absolute path to --basedir\n"); + return 1; + } + torture->outputdir = basedir; + } else { + char *pwd = talloc_size(torture, PATH_MAX); + if (!getcwd(pwd, PATH_MAX)) { + fprintf(stderr, "Unable to determine current working directory\n"); + return 1; + } + torture->outputdir = pwd; + } + if (argc_new == 0) { printf("You must specify a test to run, or 'ALL'\n"); + } else if (shell) { + run_shell(torture); } else { - int total; - double rate; for (i=2;iskipped+torture->success+torture->failed; - if (total == 0) { - printf("No tests run.\n"); - } else { - rate = ((total - torture->failed) * (100.0 / total)); - printf("Tests: %d, Errors: %d, Skipped: %d. Success rate: %.2f%%\n", - total, torture->failed, torture->skipped, - rate); - } } - talloc_free(torture); - - if (correct) { + if (torture->returncode && correct) { return(0); } else { return(1);