diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-11-01 00:24:55 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-11-01 00:24:55 +0100 |
| commit | 59206674521065e041a6020f9ba793fac47b1d7d (patch) | |
| tree | 7f693ab5a6d19f3b5f853e12e1f8beb77e2aa6af /source4/torture | |
| parent | c7cedd3a67b08be933a3101162bd5745284c8bf8 (diff) | |
| download | samba-59206674521065e041a6020f9ba793fac47b1d7d.tar.gz samba-59206674521065e041a6020f9ba793fac47b1d7d.tar.bz2 samba-59206674521065e041a6020f9ba793fac47b1d7d.zip | |
Split out torture results from torture context.
Diffstat (limited to 'source4/torture')
| -rw-r--r-- | source4/torture/smbtorture.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source4/torture/smbtorture.c b/source4/torture/smbtorture.c index 19f1d1ae35..bfe6d0503d 100644 --- a/source4/torture/smbtorture.c +++ b/source4/torture/smbtorture.c @@ -370,7 +370,7 @@ static void quiet_suite_start(struct torture_context *ctx, struct torture_suite *suite) { int i; - ctx->quiet = true; + ctx->results->quiet = true; for (i = 1; i < ctx->level; i++) putchar('\t'); printf("%s: ", suite->name); fflush(stdout); @@ -456,6 +456,7 @@ int main(int argc,char *argv[]) int max_runtime=0; int argc_new; struct torture_context *torture; + struct torture_results *results; const struct torture_ui_ops *ui_ops; char **argv_new; poptContext pc; @@ -627,7 +628,9 @@ int main(int argc,char *argv[]) exit(1); } - torture = torture_context_init(s4_event_context_init(NULL), ui_ops); + results = torture_results_init(talloc_autofree_context(), ui_ops); + + torture = torture_context_init(s4_event_context_init(NULL), results); if (basedir != NULL) { if (basedir[0] != '/') { fprintf(stderr, "Please specify an absolute path to --basedir\n"); @@ -657,7 +660,7 @@ int main(int argc,char *argv[]) } } - if (torture->returncode && correct) { + if (torture->results->returncode && correct) { return(0); } else { return(1); |