svn commit: samba r19563 - in branches/SAMBA_4_0/source/torture: .

[tridge at samba.org]

Author: tridge
Date: 2006-11-05 04:28:45 +0000 (Sun, 05 Nov 2006)
New Revision: 19563

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19563

Log:

- make --num-progs a valid smbtorture option again. It's commonly
  used.

- mark -t as an integer option

Modified:
   branches/SAMBA_4_0/source/torture/smbtorture.c


Changeset:
Modified: branches/SAMBA_4_0/source/torture/smbtorture.c
===================================================================
--- branches/SAMBA_4_0/source/torture/smbtorture.c	2006-11-05 00:26:44 UTC (rev 19562)
+++ branches/SAMBA_4_0/source/torture/smbtorture.c	2006-11-05 04:28:45 UTC (rev 19563)
@@ -519,18 +519,19 @@
 	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 @@
 		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;