lib/util: consolidate module loading into common code

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

diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index d80acffa0dc1bbdb024bcc90f47adaa6f111e427..b066d3e1ac612b302de21326c2c5d09966026388 100644 (file)
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -20,11 +20,10 @@
 
 #include "includes.h"
 #include "system/time.h"
-#include "torture/torture.h"
-#include "../lib/util/dlinklist.h"
 #include "param/param.h"
 #include "lib/cmdline/popt_common.h"
 #include "torture/smbtorture.h"
+#include "lib/util/samba_modules.h"
 
 _PUBLIC_ int torture_numops=10;
 _PUBLIC_ int torture_entries=1000;
@@ -45,32 +44,12 @@ bool torture_register_suite(struct torture_suite *suite)
        return torture_suite_add_suite(torture_root, suite);
 }
 
-#ifndef HAVE_NETAPI_H
-NTSTATUS torture_libnetapi_init(void)
-{
-       return NT_STATUS_OK;
-}
-#endif
-
 _PUBLIC_ int torture_init(void)
 {
-       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);
-#ifdef HAVE_NETAPI_H
-       extern NTSTATUS torture_libnetapi_init(void);
-#endif
-       extern NTSTATUS torture_raw_init(void);
-       extern NTSTATUS torture_unix_init(void);
-       extern NTSTATUS torture_winbind_init(void);
+#define _MODULE_PROTO(init) extern NTSTATUS init(void);
+       STATIC_smbtorture_MODULES_PROTO;
        init_module_fn static_init[] = { STATIC_smbtorture_MODULES };
-       init_module_fn *shared_init = load_samba_modules(NULL, cmdline_lp_ctx, "smbtorture");
+       init_module_fn *shared_init = load_samba_modules(NULL, "smbtorture");
 
        run_init_functions(static_init);
        run_init_functions(shared_init);