diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-10-18 10:03:30 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:21:23 -0500 |
| commit | 1d3663c23077abab81c5a015b5c66ad0a274c882 (patch) | |
| tree | 94311b617b2fcfaa48ba9d6b07ee581ad3b318eb /source4/torture/smbtorture.c | |
| parent | 43aa9f86f5c574f5dac70970f574a0c0a3c4eab1 (diff) | |
| download | samba-1d3663c23077abab81c5a015b5c66ad0a274c882.tar.gz samba-1d3663c23077abab81c5a015b5c66ad0a274c882.tar.bz2 samba-1d3663c23077abab81c5a015b5c66ad0a274c882.zip | |
r19387: Exit with 0 if failures were expected
(This used to be commit b4fc06aeafa3ed8460759409a72b4de43a534d62)
Diffstat (limited to 'source4/torture/smbtorture.c')
| -rw-r--r-- | source4/torture/smbtorture.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source4/torture/smbtorture.c b/source4/torture/smbtorture.c index fdd44ddc08..ce05989327 100644 --- a/source4/torture/smbtorture.c +++ b/source4/torture/smbtorture.c @@ -517,8 +517,10 @@ const static struct torture_ui_ops quiet_ui_ops = { if (strcmp(target, "samba3") == 0) { lp_set_cmdline("target:samba3", "true"); + lp_set_cmdline("torture:knownfail", "samba3-knownfail"); } else if (strcmp(target, "samba4") == 0) { lp_set_cmdline("target:samba4", "true"); + lp_set_cmdline("torture:knownfail", "samba4-knownfail"); } if (max_runtime) { @@ -594,8 +596,8 @@ const static struct torture_ui_ops quiet_ui_ops = { exit(1); } - torture = torture_context_init(talloc_autofree_context(), "KNOWN_FAILURES", - ui_ops); + torture = torture_context_init(talloc_autofree_context(), + lp_parm_string(-1, "torture", "knownfail"), ui_ops); if (argc_new == 0) { printf("You must specify a test to run, or 'ALL'\n"); @@ -651,9 +653,7 @@ const static struct torture_ui_ops quiet_ui_ops = { } } - talloc_free(torture); - - if (correct) { + if (torture->results.returncode) { return(0); } else { return(1); |