summaryrefslogtreecommitdiff
path: root/source4/torture/smbtorture.c
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-06-26 20:09:35 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:09:33 -0500
commit1afab0e36f87373805841bc80d2ab3b8437a5917 (patch)
treee9cdddb568e04950ab310a8086e38435416e20ca /source4/torture/smbtorture.c
parent6b749f225e8d1c910820a6576952f130e72bab84 (diff)
downloadsamba-1afab0e36f87373805841bc80d2ab3b8437a5917.tar.gz
samba-1afab0e36f87373805841bc80d2ab3b8437a5917.tar.bz2
samba-1afab0e36f87373805841bc80d2ab3b8437a5917.zip
r16527: Add target argument for smbtorture.
Remove duplicate unc path separator conversion. Add prefix for tempdirs. (This used to be commit 3763ed3092fa89558390a9721be8437a7c380790)
Diffstat (limited to 'source4/torture/smbtorture.c')
-rw-r--r--source4/torture/smbtorture.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/torture/smbtorture.c b/source4/torture/smbtorture.c
index baa8965c74..a77cc5cfdb 100644
--- a/source4/torture/smbtorture.c
+++ b/source4/torture/smbtorture.c
@@ -371,13 +371,13 @@ const static struct torture_ui_ops quiet_ui_ops = {
int main(int argc,char *argv[])
{
int opt, i;
- char *p;
BOOL correct = True;
int max_runtime=0;
int argc_new;
struct torture_context *torture;
char **argv_new;
poptContext pc;
+ static const char *target = "other";
static const char *ui_ops_name = "simple";
enum {OPT_LOADFILE=1000,OPT_UNCLIST,OPT_TIMELIMIT,OPT_DNS,
OPT_DANGEROUS,OPT_SMB_PORTS,OPT_ASYNC};
@@ -399,6 +399,7 @@ const static struct torture_ui_ops quiet_ui_ops = {
{"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},
+ {"target", 'T', POPT_ARG_STRING, &target, 0, "samba4|other", NULL},
{"async", 'a', POPT_ARG_NONE, NULL, OPT_ASYNC,
"run async tests", NULL},
{"num-async", 0, POPT_ARG_INT, &torture_numasync, 0,
@@ -490,9 +491,8 @@ const static struct torture_ui_ops quiet_ui_ops = {
exit(1);
}
- for(p = argv_new[1]; *p; p++) {
- if(*p == '\\')
- *p = '/';
+ if (!strcmp(target, "samba4")) {
+ lp_set_cmdline("target:samba4", "true");
}
/* see if its a RPC transport specifier */