tdb: raise version to 1.2.1

[ira/wip.git] / lib / torture / torture.c

diff --git a/lib/torture/torture.c b/lib/torture/torture.c
index 0ef5f612e67b45ae21aa13262bc1bf43c875d0dc..672726ebf2fce08b655aa25899d17d685d39c6cd 100644 (file)
--- a/lib/torture/torture.c
+++ b/lib/torture/torture.c
@@ -40,7 +40,7 @@ struct torture_results *torture_results_init(TALLOC_CTX *mem_ctx, const struct t
 /**
  * Initialize a torture context
  */
-struct torture_context *torture_context_init(struct event_context *event_ctx, 
+struct torture_context *torture_context_init(struct tevent_context *event_ctx, 
                                                                                         struct torture_results *results)
 {
        struct torture_context *torture = talloc_zero(event_ctx, 
@@ -65,7 +65,6 @@ struct torture_context *torture_context_child(struct torture_context *parent)
        if (subtorture == NULL)
                return NULL;
 
-       subtorture->level = parent->level+1;
        subtorture->ev = talloc_reference(subtorture, parent->ev);
        subtorture->lp_ctx = talloc_reference(subtorture, parent->lp_ctx);
        subtorture->outputdir = talloc_reference(subtorture, parent->outputdir);
@@ -107,6 +106,7 @@ void torture_comment(struct torture_context *context, const char *comment, ...)
 
        va_start(ap, comment);
        tmp = talloc_vasprintf(context, comment, ap);
+       va_end(ap);
                
        context->results->ui_ops->comment(context, tmp);
        
@@ -126,6 +126,7 @@ void torture_warning(struct torture_context *context, const char *comment, ...)
 
        va_start(ap, comment);
        tmp = talloc_vasprintf(context, comment, ap);
+       va_end(ap);
 
        context->results->ui_ops->warning(context, tmp);
 
@@ -255,7 +256,6 @@ bool torture_run_suite(struct torture_context *context,
        struct torture_suite *tsuite;
        char *old_testname;
 
-       context->level++;
        if (context->results->ui_ops->suite_start)
                context->results->ui_ops->suite_start(context, suite);
 
@@ -280,8 +280,6 @@ bool torture_run_suite(struct torture_context *context,
        if (context->results->ui_ops->suite_finish)
                context->results->ui_ops->suite_finish(context, suite);
 
-       context->level--;
-       
        return ret;
 }
 
@@ -310,7 +308,7 @@ static bool internal_torture_run_test(struct torture_context *context,
                                          bool already_setup)
 {
        bool success;
-       char *old_testname;
+       char *old_testname = NULL;
 
        if (tcase == NULL || strcmp(test->name, tcase->name) != 0) { 
                old_testname = context->active_testname;
@@ -376,8 +374,6 @@ bool torture_run_tcase(struct torture_context *context,
        char *old_testname;
        struct torture_test *test;
 
-       context->level++;
-
        context->active_tcase = tcase;
        if (context->results->ui_ops->tcase_start) 
                context->results->ui_ops->tcase_start(context, tcase);
@@ -413,8 +409,6 @@ done:
        if (context->results->ui_ops->tcase_finish)
                context->results->ui_ops->tcase_finish(context, tcase);
 
-       context->level--;
-
        return ret;
 }
 
@@ -431,6 +425,14 @@ int torture_setting_int(struct torture_context *test, const char *name,
        return lp_parm_int(test->lp_ctx, NULL, "torture", name, default_value);
 }
 
+unsigned long torture_setting_ulong(struct torture_context *test,
+                                   const char *name,
+                                   unsigned long default_value)
+{
+       return lp_parm_ulong(test->lp_ctx, NULL, "torture", name,
+                            default_value);
+}
+
 double torture_setting_double(struct torture_context *test, const char *name, 
                                                        double default_value)
 {