summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source4/torture/torture.c18
-rw-r--r--source4/torture/ui.c17
2 files changed, 18 insertions, 17 deletions
diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index b471135ce1..23b8ee3143 100644
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -23,9 +23,8 @@
#include "torture/torture.h"
#include "build.h"
#include "lib/util/dlinklist.h"
-#include "auth/credentials/credentials.h"
-#include "lib/cmdline/popt_common.h"
#include "param/param.h"
+#include "lib/cmdline/popt_common.h"
_PUBLIC_ int torture_numops=10;
_PUBLIC_ int torture_entries=1000;
@@ -46,21 +45,6 @@ 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)
{
diff --git a/source4/torture/ui.c b/source4/torture/ui.c
index 66722a4cae..a7025aac95 100644
--- a/source4/torture/ui.c
+++ b/source4/torture/ui.c
@@ -24,6 +24,23 @@
#include "lib/util/dlinklist.h"
#include "param/param.h"
#include "system/filesys.h"
+#include "auth/credentials/credentials.h"
+#include "lib/cmdline/popt_common.h"
+
+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;
+}
/**
create a temporary directory.