Split out torture results from torture context.

[ira/wip.git] / source4 / torture / smbtorture.c

diff --git a/source4/torture/smbtorture.c b/source4/torture/smbtorture.c
index 19f1d1ae35414e5bad476ee0e972f106119f190d..bfe6d0503d7c8a0e64bfa74d5ee40cf6eb20c594 100644 (file)
--- 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;
                              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);
        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;
        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;
        const struct torture_ui_ops *ui_ops;
        char **argv_new;
        poptContext pc;


@@ -627,7 +628,9 @@ int main(int argc,char *argv[])
                exit(1);
        }
 
                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");
        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);
                return(0);
        } else {
                return(1);