diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-08-28 14:42:37 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:03:02 -0500 |
| commit | 0e6773525fa9d3fe9b7559ab4067e088f8a934d8 (patch) | |
| tree | fb9498c93995015771ba6dfd27ffcaa655f698a9 /source4/torture/smbtorture.c | |
| parent | 8277256cee6328a130e3a714579a4bc766d66b9b (diff) | |
| download | samba-0e6773525fa9d3fe9b7559ab4067e088f8a934d8.tar.gz samba-0e6773525fa9d3fe9b7559ab4067e088f8a934d8.tar.bz2 samba-0e6773525fa9d3fe9b7559ab4067e088f8a934d8.zip | |
r24741: More use of the torture API.
(This used to be commit de05c3651a6e9e6611b296873526afd9292327c1)
Diffstat (limited to 'source4/torture/smbtorture.c')
| -rw-r--r-- | source4/torture/smbtorture.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source4/torture/smbtorture.c b/source4/torture/smbtorture.c index 43f6b67f1c..c96d8a2e2b 100644 --- a/source4/torture/smbtorture.c +++ b/source4/torture/smbtorture.c @@ -479,15 +479,16 @@ int main(int argc,char *argv[]) NTSTATUS status; int shell = False; static const char *ui_ops_name = "simple"; + const char *basedir = NULL; static int list_tests = 0; enum {OPT_LOADFILE=1000,OPT_UNCLIST,OPT_TIMELIMIT,OPT_DNS, OPT_LIST, - OPT_DANGEROUS,OPT_SMB_PORTS,OPT_ASYNC,OPT_NUMPROGS, OPT_BASEDIR}; + 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)", NULL }, {"smb-ports", 'p', POPT_ARG_STRING, NULL, OPT_SMB_PORTS, "SMB ports", NULL}, - {"basedir", 0, POPT_ARG_STRING, NULL, OPT_BASEDIR, "base directory", "BSAEDIR" }, + {"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, NULL, OPT_NUMPROGS, "num progs", NULL}, {"num-ops", 0, POPT_ARG_INT, &torture_numops, 0, "num ops", NULL}, @@ -539,9 +540,6 @@ int main(int argc,char *argv[]) case OPT_NUMPROGS: lp_set_cmdline("torture:nprocs", poptGetOptArg(pc)); break; - case OPT_BASEDIR: - lp_set_cmdline("torture:basedir", poptGetOptArg(pc)); - break; case OPT_DNS: parse_dns(poptGetOptArg(pc)); break; @@ -635,6 +633,7 @@ int main(int argc,char *argv[]) } torture = torture_context_init(talloc_autofree_context(), ui_ops); + torture->outputdir = basedir; if (argc_new == 0) { printf("You must specify a test to run, or 'ALL'\n"); |