summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/replace/replace-test.h4
-rw-r--r--lib/replace/replace-testsuite.h9
-rw-r--r--lib/replace/test/main.c4
-rw-r--r--lib/replace/test/testsuite.c6
-rw-r--r--source4/torture/local/local.c2
5 files changed, 7 insertions, 18 deletions
diff --git a/lib/replace/replace-test.h b/lib/replace/replace-test.h
index a522853351..ed8e75e3b1 100644
--- a/lib/replace/replace-test.h
+++ b/lib/replace/replace-test.h
@@ -1,10 +1,6 @@
#ifndef __LIB_REPLACE_REPLACE_TEST_H__
#define __LIB_REPLACE_REPLACE_TEST_H__
-#include <stdbool.h>
-struct torture_context;
-
-bool torture_local_replace(struct torture_context *ctx);
int libreplace_test_strptime(void);
int test_readdir_os2_delete(void);
int getifaddrs_test(void);
diff --git a/lib/replace/replace-testsuite.h b/lib/replace/replace-testsuite.h
index a522853351..b28dbec067 100644
--- a/lib/replace/replace-testsuite.h
+++ b/lib/replace/replace-testsuite.h
@@ -1,13 +1,10 @@
-#ifndef __LIB_REPLACE_REPLACE_TEST_H__
-#define __LIB_REPLACE_REPLACE_TEST_H__
+#ifndef __LIB_REPLACE_REPLACE_TESTSUITE_H__
+#define __LIB_REPLACE_REPLACE_TESTSUITE_H__
#include <stdbool.h>
struct torture_context;
bool torture_local_replace(struct torture_context *ctx);
-int libreplace_test_strptime(void);
-int test_readdir_os2_delete(void);
-int getifaddrs_test(void);
-#endif /* __LIB_REPLACE_REPLACE_TEST_H__ */
+#endif /* __LIB_REPLACE_REPLACE_TESTSUITE_H__ */
diff --git a/lib/replace/test/main.c b/lib/replace/test/main.c
index 9bd12840a5..94264d7367 100644
--- a/lib/replace/test/main.c
+++ b/lib/replace/test/main.c
@@ -24,9 +24,7 @@
*/
#include "replace.h"
-
-struct torture_context;
-bool torture_local_replace(struct torture_context *ctx);
+#include "replace-testsuite.h"
int main(void)
{
diff --git a/lib/replace/test/testsuite.c b/lib/replace/test/testsuite.c
index 0c1fac67a0..04658bea05 100644
--- a/lib/replace/test/testsuite.c
+++ b/lib/replace/test/testsuite.c
@@ -24,6 +24,8 @@
*/
#include "replace.h"
+#include "replace-test.h"
+#include "replace-testsuite.h"
/*
we include all the system/ include files here so that libreplace tests
@@ -48,8 +50,6 @@
#define TESTFILE "testfile.dat"
-struct torture_context;
-bool torture_local_replace(struct torture_context *ctx);
/*
test ftruncate() function
@@ -379,8 +379,6 @@ static int test_opendir(void)
return true;
}
-extern int test_readdir_os2_delete(void);
-
static int test_readdir(void)
{
printf("test: readdir\n");
diff --git a/source4/torture/local/local.c b/source4/torture/local/local.c
index c0b3305462..d4e891116f 100644
--- a/source4/torture/local/local.c
+++ b/source4/torture/local/local.c
@@ -24,7 +24,7 @@
#include "torture/auth/proto.h"
#include "../lib/crypto/test_proto.h"
#include "lib/registry/tests/proto.h"
-#include "lib/replace/replace-test.h"
+#include "lib/replace/replace-testsuite.h"
/* ignore me */ static struct torture_suite *
(*suite_generators[]) (TALLOC_CTX *mem_ctx) =