summaryrefslogtreecommitdiff
path: root/source4/torture
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2004-11-06 23:23:15 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:05:36 -0500
commit71db46ea665606384f2be1be708c74c97c9adfb2 (patch)
tree24c84e12f4fc925f3ec1e69348493d7222df1e44 /source4/torture
parentb012ab557b8f8a2f58dfbbe8b7818f3e6d8cf38f (diff)
downloadsamba-71db46ea665606384f2be1be708c74c97c9adfb2.tar.gz
samba-71db46ea665606384f2be1be708c74c97c9adfb2.tar.bz2
samba-71db46ea665606384f2be1be708c74c97c9adfb2.zip
r3586: Fix some of the issues with the module init functions.
Both subsystems and modules can now have init functions, which can be specified in .mk files (INIT_FUNCTION = ...) The build system will define : - SUBSYSTEM_init_static_modules that calls the init functions of all statically compiled modules. Failing to load will generate an error which is not fatal - BINARY_init_subsystems that calls the init functions (if defined) for the subsystems the binary depends on This removes the hack with the "static bool Initialised = " and the "lazy_init" functions (This used to be commit 7a8244761bfdfdfb48f8264d76951ebdfbf7bd8a)
Diffstat (limited to 'source4/torture')
-rw-r--r--source4/torture/gentest.c2
-rw-r--r--source4/torture/locktest.c2
-rw-r--r--source4/torture/masktest.c2
-rw-r--r--source4/torture/torture.c2
4 files changed, 8 insertions, 0 deletions
diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c
index 310dec1bc7..563703bd2a 100644
--- a/source4/torture/gentest.c
+++ b/source4/torture/gentest.c
@@ -2107,6 +2107,8 @@ static void usage(void)
setup_logging(argv[0], DEBUG_STDOUT);
+ gentest_init_subsystems;
+
for (i=0;i<NSERVERS;i++) {
const char *share = argv[1+i];
if (!split_unc_name(share, &servers[i].server_name, &servers[i].share_name)) {
diff --git a/source4/torture/locktest.c b/source4/torture/locktest.c
index 6c55190d6b..9725bc37ec 100644
--- a/source4/torture/locktest.c
+++ b/source4/torture/locktest.c
@@ -459,6 +459,8 @@ static void usage(void)
int opt;
int seed, server, i;
+ locktest_init_subsystems;
+
setlinebuf(stdout);
setup_logging("locktest", DEBUG_STDOUT);
diff --git a/source4/torture/masktest.c b/source4/torture/masktest.c
index ad5f703008..bb0abf4b3e 100644
--- a/source4/torture/masktest.c
+++ b/source4/torture/masktest.c
@@ -277,6 +277,8 @@ static void usage(void)
char *p;
int seed;
+ masktest_init_subsystems;
+
setlinebuf(stdout);
setup_logging("masktest", DEBUG_STDOUT);
diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index e7472ffa46..883fe4b017 100644
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -2632,6 +2632,8 @@ static BOOL is_binding_string(const char *binding_string)
POPT_TABLEEND
};
+ smbtorture_init_subsystems;
+
setup_logging("smbtorture", DEBUG_STDOUT);
#ifdef HAVE_SETBUFFER