Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3

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

diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index 803e0c6bd7868e711c680377da97519797cd7cba..39d85e0572f9f968aa4e37da4b0f088a4ad1f796 100644 (file)
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -21,9 +21,8 @@
 #include "includes.h"
 #include "system/time.h"
 #include "torture/torture.h"
-#include "build.h"
 #include "lib/util/dlinklist.h"
-#include "auth/credentials/credentials.h"
+#include "param/param.h"
 #include "lib/cmdline/popt_common.h"
 
 _PUBLIC_ int torture_numops=10;
@@ -32,7 +31,7 @@ _PUBLIC_ int torture_failures=1;
 _PUBLIC_ int torture_seed=0;
 _PUBLIC_ int torture_numasync=100;
 
-struct torture_suite *torture_root;
+struct torture_suite *torture_root = NULL;
 
 bool torture_register_suite(struct torture_suite *suite)
 {
@@ -45,26 +44,23 @@ bool torture_register_suite(struct torture_suite *suite)
        return torture_suite_add_suite(torture_root, suite);
 }
 
-struct torture_context *torture_context_init(TALLOC_CTX *mem_ctx, 
-                                            const struct torture_ui_ops *ui_ops)
-{
-       struct torture_context *torture = talloc_zero(mem_ctx, 
-                                                     struct torture_context);
-       torture->ui_ops = ui_ops;
-       torture->returncode = true;
-       torture->ev = cli_credentials_get_event_context(cmdline_credentials);
-
-       if (ui_ops->init)
-               ui_ops->init(torture);
-
-       return torture;
-}
-
 
-int torture_init(void)
+_PUBLIC_ int torture_init(void)
 {
-       init_module_fn static_init[] = STATIC_torture_MODULES;
-       init_module_fn *shared_init = load_samba_modules(NULL, "torture");
+       extern NTSTATUS torture_base_init(void);
+       extern NTSTATUS torture_ldap_init(void);
+       extern NTSTATUS torture_local_init(void);
+       extern NTSTATUS torture_nbt_init(void);
+       extern NTSTATUS torture_nbench_init(void);
+       extern NTSTATUS torture_rap_init(void);
+       extern NTSTATUS torture_rpc_init(void);
+       extern NTSTATUS torture_smb2_init(void);
+       extern NTSTATUS torture_net_init(void);
+       extern NTSTATUS torture_raw_init(void);
+       extern NTSTATUS torture_unix_init(void);
+       extern NTSTATUS torture_winbind_init(void);
+       init_module_fn static_init[] = { STATIC_torture_MODULES };
+       init_module_fn *shared_init = load_samba_modules(NULL, cmdline_lp_ctx, "torture");
 
        run_init_functions(static_init);
        run_init_functions(shared_init);