From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Thu, 28 Oct 2021 18:55:00 +0000 (-0400)
Subject: Don't include the source file for the code under test unless we really need to
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=529bcb2caa425a21d3c0296babb33f70e09590ab;p=thirdparty%2Ffreeradius-server.git

Don't include the source file for the code under test unless we really need to
---

diff --git a/src/lib/server/trunk_tests.c b/src/lib/server/trunk_tests.c
index c93da4cd269..5a56292442f 100644
--- a/src/lib/server/trunk_tests.c
+++ b/src/lib/server/trunk_tests.c
@@ -1,9 +1,8 @@
 #include <freeradius-devel/util/acutest.h>
+#include <freeradius-devel/server/trunk.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 
-#include "trunk.c"
-
 #if 0
 //#include <gperftools/profiler.h>
 typedef struct {
diff --git a/src/lib/util/cursor_tests.c b/src/lib/util/cursor_tests.c
index fd7653ab920..18208f3848b 100644
--- a/src/lib/util/cursor_tests.c
+++ b/src/lib/util/cursor_tests.c
@@ -1,6 +1,5 @@
 #include <freeradius-devel/util/acutest.h>
-
-#include "cursor.c"
+#include <freeradius-devel/util/cursor.h>
 
 typedef struct {
 	char const *name;
diff --git a/src/lib/util/dcursor_tests.c b/src/lib/util/dcursor_tests.c
index 65b134d4a2d..c6b98a94d78 100644
--- a/src/lib/util/dcursor_tests.c
+++ b/src/lib/util/dcursor_tests.c
@@ -1,9 +1,9 @@
 #include <freeradius-devel/util/acutest.h>
+#include <freeradius-devel/util/dcursor.h>
 //#include <talloc.h>
 //nclude <string.h>
 //#include <stdint.h>
 
-#include "dcursor.c"
 
 typedef struct {
 	char const *name;
diff --git a/src/lib/util/dict_test.h b/src/lib/util/dict_test.h
index b94e2d0d1bb..747f066fd20 100644
--- a/src/lib/util/dict_test.h
+++ b/src/lib/util/dict_test.h
@@ -23,6 +23,8 @@
  */
 RCSIDH(dict_test_h, "$Id$")
 
+#include <freeradius-devel/util/dict.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/src/lib/util/pair_list_perf_test.c b/src/lib/util/pair_list_perf_test.c
index 21932806521..ee7a857f9a8 100644
--- a/src/lib/util/pair_list_perf_test.c
+++ b/src/lib/util/pair_list_perf_test.c
@@ -46,7 +46,6 @@ static void pair_list_perf_init(void);
 #undef WITH_VERIFY_PTR
 #endif
 
-#include "pair.c"
 #include <freeradius-devel/util/dict_test.h>
 #include <freeradius-devel/server/base.h>
 
diff --git a/src/lib/util/rb_tests.c b/src/lib/util/rb_tests.c
index 49981399198..f87e6855e8a 100644
--- a/src/lib/util/rb_tests.c
+++ b/src/lib/util/rb_tests.c
@@ -23,8 +23,7 @@
 #include <freeradius-devel/util/acutest.h>
 #include <freeradius-devel/util/acutest_helpers.h>
 #include <freeradius-devel/util/rand.h>
-
-#include "rb.c"
+#include <freeradius-devel/util/rb.h>
 
 #define MAXSIZE 128