diff options
| author | Andrew Tridgell <tridge@samba.org> | 2006-11-05 04:28:45 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:24:52 -0500 |
| commit | 67a76a6e451987df2c0a0b900ee623a41f79274f (patch) | |
| tree | 8565c919a8f25a438818173feb422711d1cf65f2 /source4/torture | |
| parent | a7b18e70dd315efc15045d32c0c2bfdb76cf4805 (diff) | |
| download | samba-67a76a6e451987df2c0a0b900ee623a41f79274f.tar.gz samba-67a76a6e451987df2c0a0b900ee623a41f79274f.tar.bz2 samba-67a76a6e451987df2c0a0b900ee623a41f79274f.zip | |
r19563: - make --num-progs a valid smbtorture option again. It's commonly
used.
- mark -t as an integer option
(This used to be commit 6602b605f6565c592500900e0f797f216f9910ff)
Diffstat (limited to 'source4/torture')
| -rw-r--r-- | source4/torture/smbtorture.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source4/torture/smbtorture.c b/source4/torture/smbtorture.c index fbbaa387aa..2963e71366 100644 --- a/source4/torture/smbtorture.c +++ b/source4/torture/smbtorture.c @@ -519,18 +519,19 @@ int main(int argc,char *argv[]) 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}; + 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 }, {"smb-ports", 'p', POPT_ARG_STRING, NULL, OPT_SMB_PORTS, "SMB ports", NULL}, {"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}, {"entries", 0, POPT_ARG_INT, &torture_entries, 0, "entries", NULL}, {"loadfile", 0, POPT_ARG_STRING, NULL, OPT_LOADFILE, "loadfile", 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, @@ -571,6 +572,9 @@ int main(int argc,char *argv[]) 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; |