Merge branch 'master' of ssh://git.samba.org/data/git/samba into displaysec

[samba.git] / lib / torture / torture.c

diff --git a/lib/torture/torture.c b/lib/torture/torture.c
index e465529f6b0c3ecc8d63405d357c9b7362ca5ad1..17adce94e57395b923ada59b7fcd25a89d31d26d 100644 (file)
--- a/lib/torture/torture.c
+++ b/lib/torture/torture.c
@@ -2,7 +2,7 @@
    Unix SMB/CIFS implementation.
    SMB torture UI functions
 
-   Copyright (C) Jelmer Vernooij 2006
+   Copyright (C) Jelmer Vernooij 2006-2008
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,8 +18,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
-#include "torture/torture.h"
+#include "source4/include/includes.h"
+#include "../torture/torture.h"
 #include "../lib/util/dlinklist.h"
 #include "param/param.h"
 #include "system/filesys.h"
@@ -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, 
@@ -310,7 +310,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;