move util API tests to src/lib/util/test

they were starting to clutter up the directory.

These tests are not in src/tests, because they create binaries
which test the APIs.

diff --git a/src/lib/eap_aka_sim/crypto.c b/src/lib/eap_aka_sim/crypto.c
index 58aed0e08358e265a7e904f9e5ee707a72c49630..3a8c85d53bcbb642e4cd442291c6c8e8018f71e4 100644 (file)
--- a/src/lib/eap_aka_sim/crypto.c
+++ b/src/lib/eap_aka_sim/crypto.c
@@ -1335,7 +1335,7 @@ void fr_aka_sim_crypto_keys_log(request_t *request, fr_aka_sim_keys_t *keys)
  */
 #include <stddef.h>
 #include <stdbool.h>
-#include <freeradius-devel/util/acutest.h>
+#include <freeradius-devel/util/test/acutest.h>
 
 /*
  *     EAP-SIM (RFC4186) GSM authentication vectors

diff --git a/src/lib/eap_aka_sim/fips186prf.c b/src/lib/eap_aka_sim/fips186prf.c
index 2f9da199428902824666050e86c23d5345f526f9..b60324974d70abce0971e723f7d9ee516d65ac04 100644 (file)
--- a/src/lib/eap_aka_sim/fips186prf.c
+++ b/src/lib/eap_aka_sim/fips186prf.c
@@ -169,7 +169,7 @@ void fr_aka_sim_fips186_2prf(uint8_t out[static 160], uint8_t mk[static 20])
 /*
  *  cc fips186prf.c -g3 -Wall -DTESTING_FIPS186_PRF -DHAVE_DLFCN_H -DWITH_TLS -I../../../../ -I../../../ -I ../base/ -I /usr/local/opt/openssl/include/ -include ../include/build.h -L /usr/local/opt/openssl/lib/ -l ssl -l crypto -l talloc -L ../../../../../build/lib/local/.libs/ -lfreeradius-server -lfreeradius-tls -lfreeradius-util -o test_fips186prf && ./test_fips186prf
  */
-#include <freeradius-devel/util/acutest.h>
+#include <freeradius-devel/util/test/acutest.h>
 
 /*
  * test vectors

diff --git a/src/lib/eap_aka_sim/id.c b/src/lib/eap_aka_sim/id.c
index 39cf930ffae634fde45916266f49d747b66ac363..c1a51d613cbce1891f01f94693bd50ebdc5ac7de 100644 (file)
--- a/src/lib/eap_aka_sim/id.c
+++ b/src/lib/eap_aka_sim/id.c
@@ -672,7 +672,7 @@ int fr_aka_sim_id_3gpp_pseudonym_decrypt(char out[AKA_SIM_IMSI_MAX_LEN + 1],
  */
 #include <stddef.h>
 #include <stdbool.h>
-#include <freeradius-devel/util/acutest.h>
+#include <freeradius-devel/util/test/acutest.h>
 
 void test_encrypt_decypt_key0(void)
 {

diff --git a/src/lib/redis/test.c b/src/lib/redis/test.c
index 1febe664b1fdf91c2218670d9aced65a424a0df5..3a59d2becf88c3ad86035903a283a56074019f99 100644 (file)
--- a/src/lib/redis/test.c
+++ b/src/lib/redis/test.c
@@ -1,7 +1,7 @@
 /*
  *  cc  -g3 -Wall -DHAVE_DLFCN_H -I../../../src -include freeradius-devel/build.h -L../../../build/lib/local/.libs -ltalloc -lhiredis -lfreeradius-unlang -lfreeradius-util -lfreeradius-server -o test_redis test.c redis.c io.c crc16.c
  */
-#include <freeradius-devel/util/acutest.h>
+#include <freeradius-devel/util/test/acutest.h>
 #include "base.h"
 #include "io.h"
 #include "pipeline.h"

diff --git a/src/lib/server/pair_server_tests.c b/src/lib/server/pair_server_tests.c
index be4caf3f7eaeb99f6991e722e6445fa8cd8e349f..4844cd1a2c9166e26d16d086b4e5530d69badbc7 100644 (file)
--- a/src/lib/server/pair_server_tests.c
+++ b/src/lib/server/pair_server_tests.c
@@ -24,9 +24,9 @@
 static void test_init(void);
 #  define TEST_INIT  test_init()
 
-#include <freeradius-devel/util/acutest.h>
-#include <freeradius-devel/util/acutest_helpers.h>
-#include <freeradius-devel/util/pair_test_helpers.h>
+#include <freeradius-devel/util/test/acutest.h>
+#include <freeradius-devel/util/test/acutest_helpers.h>
+#include <freeradius-devel/util/test/pair_test_helpers.h>
 
 #include <freeradius-devel/util/conf.h>
 #include <freeradius-devel/util/dict.h>

diff --git a/src/lib/server/state_test.c b/src/lib/server/state_test.c
index ea16218c6b574633f47e819c818ecf2e2e4225d4..74e6f580111ea2a75b846e7d6b1893fbc56db1af 100644 (file)
--- a/src/lib/server/state_test.c
+++ b/src/lib/server/state_test.c
@@ -1,4 +1,4 @@
-#include <freeradius-devel/util/acutest.h>
+#include <freeradius-devel/util/test/acutest.h>
 
 fr_time_t      test_time;
 

diff --git a/src/lib/server/tmpl_dcursor_tests.c b/src/lib/server/tmpl_dcursor_tests.c
index 2324e5ef09de69c826d38f2dc56ff51c884801c0..3b9e3937f07b0ded9981abf1d9a08e573cf6dfef 100644 (file)
--- a/src/lib/server/tmpl_dcursor_tests.c
+++ b/src/lib/server/tmpl_dcursor_tests.c
@@ -1,8 +1,8 @@
 static void test_init(void);
 #  define TEST_INIT  test_init()
 
-#include <freeradius-devel/util/acutest.h>
-#include <freeradius-devel/util/acutest_helpers.h>
+#include <freeradius-devel/util/test/acutest.h>
+#include <freeradius-devel/util/test/acutest_helpers.h>
 #include <freeradius-devel/util/dict_test.h>
 #include <freeradius-devel/server/tmpl_dcursor.h>
 #include <freeradius-devel/server/pair.h>

diff --git a/src/lib/server/trunk_tests.c b/src/lib/server/trunk_tests.c
index b3486d82ec5f1887c70cc94b5968566a54154b5c..2a862408849ce629ee80d150d6c7713bb2f4e219 100644 (file)
--- a/src/lib/server/trunk_tests.c
+++ b/src/lib/server/trunk_tests.c
@@ -1,5 +1,5 @@
-#include <freeradius-devel/util/acutest.h>
-#include <freeradius-devel/util/acutest_helpers.h>
+#include <freeradius-devel/util/test/acutest.h>
+#include <freeradius-devel/util/test/acutest_helpers.h>
 #include <freeradius-devel/util/syserror.h>
 #include <sys/socket.h>
 

diff --git a/src/lib/sim/milenage.c b/src/lib/sim/milenage.c
index 8397d81dd85264a347d8438a62a3c76d09e8f466..5b3e86a48476df1e04c4cea2596616e9ffb3fb95 100644 (file)
--- a/src/lib/sim/milenage.c
+++ b/src/lib/sim/milenage.c
@@ -478,7 +478,7 @@ int milenage_check(uint8_t ik[MILENAGE_IK_SIZE],
 /*
  *  cc milenage.c -g3 -Wall -DHAVE_DLFCN_H -DTESTING_MILENAGE -DWITH_TLS -I../../../../ -I../../../ -I ../base/ -I /usr/local/opt/openssl/include/ -include ../include/build.h -L /usr/local/opt/openssl/lib/ -l ssl -l crypto -l talloc -L ../../../../../build/lib/local/.libs/ -lfreeradius-server -lfreeradius-tls -lfreeradius-util -o test_milenage && ./test_milenage
  */
-#include <freeradius-devel/util/acutest.h>
+#include <freeradius-devel/util/test/acutest.h>
 
 void test_set_1(void)
 {

diff --git a/src/lib/util/all.mk b/src/lib/util/all.mk
index 83a01cd50a9a9242b2adbc85bc63f9af3bf3ef08..faf162400c24fe4a4fd3e88f2e917db6acb12998 100644 (file)
--- a/src/lib/util/all.mk
+++ b/src/lib/util/all.mk
@@ -1,24 +1,3 @@
 SUBMAKEFILES := \
-       base_16_32_64_tests.mk \
-       dbuff_tests.mk \
-       dcursor_tests.mk \
-       dcursor_typed_tests.mk \
-       dlist_tests.mk \
-       edit_tests.mk \
-       heap_tests.mk \
-       hmac_tests.mk \
        libfreeradius-util.mk \
-       lst_tests.mk \
-       minmax_heap_tests.mk \
-       pair_legacy_tests.mk \
-       pair_list_perf_test.mk \
-       pair_nested_tests.mk \
-       pair_tests.mk \
-       rb_tests.mk \
-       sbuff_tests.mk \
-       size_tests.mk \
-       slab_tests.mk \
-       strerror_tests.mk \
-       time_tests.mk \
-       timer_tests.mk
-
+       test/all.mk

diff --git a/src/lib/util/acutest.h b/src/lib/util/test/acutest.h
similarity index 100%
rename from src/lib/util/acutest.h
rename to src/lib/util/test/acutest.h

diff --git a/src/lib/util/acutest_helpers.h b/src/lib/util/test/acutest_helpers.h
similarity index 97%
rename from src/lib/util/acutest_helpers.h
rename to src/lib/util/test/acutest_helpers.h
index 4ab840c11727910ad922a6d66a9aa40f09256061..067fc73a016dd7996286a6776643138f5113ab73 100644 (file)
--- a/src/lib/util/acutest_helpers.h
+++ b/src/lib/util/test/acutest_helpers.h
@@ -17,7 +17,7 @@
 
 /** Type specific TEST_CHECK macros for acutest
  *
- * @file src/lib/util/acutest_helpers.h
+ * @file src/lib/util/test//test/acutest_helpers.h
  *
  * @copyright 2020 Arran Cudbard-Bell
  */

diff --git a/src/lib/util/test/all.mk b/src/lib/util/test/all.mk
new file mode 100644 (file)
index 0000000..0735458
--- /dev/null
+++ b/src/lib/util/test/all.mk
@@ -0,0 +1,22 @@
+SUBMAKEFILES := \
+       base_16_32_64_tests.mk \
+       dbuff_tests.mk \
+       dcursor_tests.mk \
+       dcursor_typed_tests.mk \
+       dlist_tests.mk \
+       edit_tests.mk \
+       heap_tests.mk \
+       hmac_tests.mk \
+       lst_tests.mk \
+       minmax_heap_tests.mk \
+       pair_legacy_tests.mk \
+       pair_list_perf_test.mk \
+       pair_nested_tests.mk \
+       pair_tests.mk \
+       rb_tests.mk \
+       sbuff_tests.mk \
+       size_tests.mk \
+       slab_tests.mk \
+       strerror_tests.mk \
+       time_tests.mk \
+       timer_tests.mk

diff --git a/src/lib/util/base_16_32_64_tests.c b/src/lib/util/test/base_16_32_64_tests.c
similarity index 97%
rename from src/lib/util/base_16_32_64_tests.c
rename to src/lib/util/test/base_16_32_64_tests.c
index 4f5a78bb90be4f22c3931acba17d1f6bde8a3b2c..64d7a0dee89c56972837b5b0cc6d485826c62ee4 100644 (file)
--- a/src/lib/util/base_16_32_64_tests.c
+++ b/src/lib/util/test/base_16_32_64_tests.c
@@ -1,9 +1,9 @@
-#include <freeradius-devel/util/acutest.h>
-#include <freeradius-devel/util/acutest_helpers.h>
+#include "acutest.h"
+#include"acutest_helpers.h"
 
-#include "base16.h"
-#include "base32.h"
-#include "base64.h"
+#include <freeradius-devel/util/base16.h>
+#include <freeradius-devel/util/base32.h>
+#include <freeradius-devel/util/base64.h>
 
 typedef struct {
        struct {

diff --git a/src/lib/util/base_16_32_64_tests.mk b/src/lib/util/test/base_16_32_64_tests.mk
similarity index 100%
rename from src/lib/util/base_16_32_64_tests.mk
rename to src/lib/util/test/base_16_32_64_tests.mk

diff --git a/src/lib/util/dbuff_tests.c b/src/lib/util/test/dbuff_tests.c
similarity index 99%
rename from src/lib/util/dbuff_tests.c
rename to src/lib/util/test/dbuff_tests.c
index 0360598eb956de1ebaf1939a84d018b7f3b25f2a..e421e7b34af8d82da953df779bbe3d1c9a6f0e93 100644 (file)
--- a/src/lib/util/dbuff_tests.c
+++ b/src/lib/util/test/dbuff_tests.c
@@ -1,8 +1,8 @@
-#include <freeradius-devel/util/acutest.h>
-#include <freeradius-devel/util/acutest_helpers.h>
+#include "acutest.h"
+#include"acutest_helpers.h"
 #include <float.h>
 
-#include "dbuff.h"
+#include <freeradius-devel/util/dbuff.h>
 
 //#include <gperftools/profiler.h>
 

diff --git a/src/lib/util/dbuff_tests.mk b/src/lib/util/test/dbuff_tests.mk
similarity index 100%
rename from src/lib/util/dbuff_tests.mk
rename to src/lib/util/test/dbuff_tests.mk

diff --git a/src/lib/util/dcursor_tests.c b/src/lib/util/test/dcursor_tests.c
similarity index 99%
rename from src/lib/util/dcursor_tests.c
rename to src/lib/util/test/dcursor_tests.c
index 76ea309c5465059091adc69e1ec607594af05d6b..14f04f61b233197cd5fdcca3853439a201bda3c3 100644 (file)
--- a/src/lib/util/dcursor_tests.c
+++ b/src/lib/util/test/dcursor_tests.c
@@ -1,6 +1,6 @@
-#include <freeradius-devel/util/acutest.h>
+#include "acutest.h"
 
-#include "dcursor.c"
+#include "../dcursor.c"
 
 typedef struct {
        char const *name;

diff --git a/src/lib/util/dcursor_tests.mk b/src/lib/util/test/dcursor_tests.mk
similarity index 100%
rename from src/lib/util/dcursor_tests.mk
rename to src/lib/util/test/dcursor_tests.mk

diff --git a/src/lib/util/dcursor_typed_tests.c b/src/lib/util/test/dcursor_typed_tests.c
similarity index 99%
rename from src/lib/util/dcursor_typed_tests.c
rename to src/lib/util/test/dcursor_typed_tests.c
index 52148e89a20835c19588660feff70c85c7429dcf..d45637c39d71a8c1917791c2b973841227ba4a6b 100644 (file)
--- a/src/lib/util/dcursor_typed_tests.c
+++ b/src/lib/util/test/dcursor_typed_tests.c
@@ -1,6 +1,6 @@
-#include <freeradius-devel/util/acutest.h>
+#include "acutest.h"
 
-#include "dcursor.c"
+#include "../dcursor.c"
 
 /*
  *     A repeat of the tests in dcursor_tests.c, but using

diff --git a/src/lib/util/dcursor_typed_tests.mk b/src/lib/util/test/dcursor_typed_tests.mk
similarity index 100%
rename from src/lib/util/dcursor_typed_tests.mk
rename to src/lib/util/test/dcursor_typed_tests.mk

diff --git a/src/lib/util/dlist_tests.c b/src/lib/util/test/dlist_tests.c
similarity index 97%
rename from src/lib/util/dlist_tests.c
rename to src/lib/util/test/dlist_tests.c
index ea3058a300792cd3b0899546ae0dd5a4aacc1286..7d3bd6e123d0d52f4f290bbaa046216d095aac07 100644 (file)
--- a/src/lib/util/dlist_tests.c
+++ b/src/lib/util/test/dlist_tests.c
@@ -16,15 +16,15 @@
 
 /** Tests for the dlist API
  *
- * @file src/lib/util/dlist_tests.c
+ * @file src/lib/util/test//dlist_tests.c
  *
  * @copyright 2021 Arran Cudbard-Bell <a.cudbardb@freeradius.org>
  */
 
-#include <freeradius-devel/util/acutest.h>
-#include <freeradius-devel/util/acutest_helpers.h>
+#include "acutest.h"
+#include"acutest_helpers.h"
 
-#include "dlist.h"
+#include <freeradius-devel/util/dlist.h>
 
 typedef struct {
        char const      *id;

diff --git a/src/lib/util/dlist_tests.mk b/src/lib/util/test/dlist_tests.mk
similarity index 100%
rename from src/lib/util/dlist_tests.mk
rename to src/lib/util/test/dlist_tests.mk

diff --git a/src/lib/util/edit_tests.c b/src/lib/util/test/edit_tests.c
similarity index 99%
rename from src/lib/util/edit_tests.c
rename to src/lib/util/test/edit_tests.c
index 209a0eafc34fc5502f8ef6311c6c1b4a9a832699..38c429831efded032232a0d4b97505e30bcd260d 100644 (file)
--- a/src/lib/util/edit_tests.c
+++ b/src/lib/util/test/edit_tests.c
@@ -16,7 +16,7 @@
 
 /** Tests for a AVP manipulation and search API.
  *
- * @file src/lib/util/edit_tests.c
+ * @file src/lib/util/test//edit_tests.c
  * @author Alan DeKok (aland@networkradius.com)
  * @copyright 2021 Network RADIUS SAS (legal@networkradius.com)
  */
@@ -39,9 +39,9 @@ static void test_init(void);
 #      define TEST_INIT  test_init()
 #endif
 
-#include <freeradius-devel/util/acutest.h>
-#include <freeradius-devel/util/acutest_helpers.h>
-#include <freeradius-devel/util/pair_test_helpers.h>
+#include "acutest.h"
+#include"acutest_helpers.h"
+#include "pair_test_helpers.h"
 
 #include <freeradius-devel/util/conf.h>
 #include <freeradius-devel/util/dict.h>

diff --git a/src/lib/util/edit_tests.mk b/src/lib/util/test/edit_tests.mk
similarity index 100%
rename from src/lib/util/edit_tests.mk
rename to src/lib/util/test/edit_tests.mk

diff --git a/src/lib/util/heap_tests.c b/src/lib/util/test/heap_tests.c
similarity index 99%
rename from src/lib/util/heap_tests.c
rename to src/lib/util/test/heap_tests.c
index 79c1bb7eaae283c8a954c2ab1d4703149e663326..bc09c0dae4b763fffe2134214a9a232ec82656dc 100644 (file)
--- a/src/lib/util/heap_tests.c
+++ b/src/lib/util/test/heap_tests.c
@@ -1,8 +1,8 @@
-#include <freeradius-devel/util/acutest.h>
+#include "acutest.h"
 #include <freeradius-devel/util/time.h>
 #include <freeradius-devel/util/rand.h>
 
-#include "heap.c"
+#include "../heap.c"
 
 static bool fr_heap_check(fr_heap_t *h, void *data)
 {

diff --git a/src/lib/util/heap_tests.mk b/src/lib/util/test/heap_tests.mk
similarity index 100%
rename from src/lib/util/heap_tests.mk
rename to src/lib/util/test/heap_tests.mk

diff --git a/src/lib/util/hmac_tests.c b/src/lib/util/test/hmac_tests.c
similarity index 97%
rename from src/lib/util/hmac_tests.c
rename to src/lib/util/test/hmac_tests.c
index bd6e3a4fffbf1441db0cdddc2f84fad6ee6bc617..1cc92c6770810e3ddff0b75d8b3f3c806cc5789b 100644 (file)
--- a/src/lib/util/hmac_tests.c
+++ b/src/lib/util/test/hmac_tests.c
@@ -16,13 +16,13 @@
 
 /** Tests for the internal hmac functions
  *
- * @file src/lib/util/hmac_tests.c
+ * @file src/lib/util/test//hmac_tests.c
  *
  * @copyright 2021 Arran Cudbard-Bell <a.cudbardb@freeradius.org>
  */
 
-#include <freeradius-devel/util/acutest.h>
-#include <freeradius-devel/util/acutest_helpers.h>
+#include "acutest.h"
+#include"acutest_helpers.h"
 #include <freeradius-devel/util/md5.h>
 #include <freeradius-devel/util/sha1.h>
 

diff --git a/src/lib/util/hmac_tests.mk b/src/lib/util/test/hmac_tests.mk
similarity index 100%
rename from src/lib/util/hmac_tests.mk
rename to src/lib/util/test/hmac_tests.mk

diff --git a/src/lib/util/lst_tests.c b/src/lib/util/test/lst_tests.c
similarity index 99%
rename from src/lib/util/lst_tests.c
rename to src/lib/util/test/lst_tests.c
index 4e7633ee52a2f40c12d940b059d6275f0712644a..8b72d476ee562f14ce01c0f4b7c9728b135f0dbf 100644 (file)
--- a/src/lib/util/lst_tests.c
+++ b/src/lib/util/test/lst_tests.c
@@ -1,5 +1,5 @@
-#include <freeradius-devel/util/acutest.h>
-#include <freeradius-devel/util/acutest_helpers.h>
+#include "acutest.h"
+#include"acutest_helpers.h"
 #include <freeradius-devel/util/rand.h>
 #include <freeradius-devel/util/time.h>
 #include <freeradius-devel/util/heap.h>
@@ -9,7 +9,7 @@
  *     access to fr_lst_t internals that lst.h doesn't reveal
  *     to those who #include it.
  */
-#include "lst.c"
+#include "../lst.c"
 
 typedef struct {
        unsigned int    data;

diff --git a/src/lib/util/lst_tests.mk b/src/lib/util/test/lst_tests.mk
similarity index 100%
rename from src/lib/util/lst_tests.mk
rename to src/lib/util/test/lst_tests.mk

diff --git a/src/lib/util/minmax_heap_tests.c b/src/lib/util/test/minmax_heap_tests.c
similarity index 99%
rename from src/lib/util/minmax_heap_tests.c
rename to src/lib/util/test/minmax_heap_tests.c
index 3833888a9df9f801a6a4d832ff567d07d1d137bc..2c21796f57ed2c7c80d0a4a1e8f44dcf999af365 100644 (file)
--- a/src/lib/util/minmax_heap_tests.c
+++ b/src/lib/util/test/minmax_heap_tests.c
@@ -1,9 +1,9 @@
-#include <freeradius-devel/util/acutest.h>
+#include "acutest.h"
 #include <freeradius-devel/util/heap.h>
 #include <freeradius-devel/util/rand.h>
 #include <freeradius-devel/util/time.h>
 
-#include "minmax_heap.c"
+#include "../minmax_heap.c"
 
 typedef struct {
        unsigned int            data;

diff --git a/src/lib/util/minmax_heap_tests.mk b/src/lib/util/test/minmax_heap_tests.mk
similarity index 100%
rename from src/lib/util/minmax_heap_tests.mk
rename to src/lib/util/test/minmax_heap_tests.mk

diff --git a/src/lib/util/pair_legacy_tests.c b/src/lib/util/test/pair_legacy_tests.c
similarity index 98%
rename from src/lib/util/pair_legacy_tests.c
rename to src/lib/util/test/pair_legacy_tests.c
index 6c8b81f5bee9df97edf5c1ec4bc8a3de59b162e3..a13c1130b846bf3eebee678cdbb0f2d662c293ab 100644 (file)
--- a/src/lib/util/pair_legacy_tests.c
+++ b/src/lib/util/test/pair_legacy_tests.c
@@ -16,7 +16,7 @@
 
 /** Tests for a AVP manipulation and search API.
  *
- * @file src/lib/util/pair_legacy_tests.c
+ * @file src/lib/util/test//pair_legacy_tests.c
  * @author Jorge Pereira <jpereira@freeradius.org>
  * @copyright 2020 Network RADIUS SAS (legal@networkradius.com)
  */
@@ -39,9 +39,9 @@ static void test_init(void);
 #  define TEST_INIT  test_init()
 #endif
 
-#include <freeradius-devel/util/acutest.h>
-#include <freeradius-devel/util/acutest_helpers.h>
-#include <freeradius-devel/util/pair_test_helpers.h>
+#include "acutest.h"
+#include "acutest_helpers.h"
+#include "pair_test_helpers.h"
 
 #include <freeradius-devel/util/conf.h>
 #include <freeradius-devel/util/dict.h>

diff --git a/src/lib/util/pair_legacy_tests.mk b/src/lib/util/test/pair_legacy_tests.mk
similarity index 100%
rename from src/lib/util/pair_legacy_tests.mk
rename to src/lib/util/test/pair_legacy_tests.mk

diff --git a/src/lib/util/pair_list_perf_test.c b/src/lib/util/test/pair_list_perf_test.c
similarity index 99%
rename from src/lib/util/pair_list_perf_test.c
rename to src/lib/util/test/pair_list_perf_test.c
index b84100d94534b95b269b8058fd12971f83b05d33..b260dc787bc5d9f5ad3fbf966ad370762eda1e63 100644 (file)
--- a/src/lib/util/pair_list_perf_test.c
+++ b/src/lib/util/test/pair_list_perf_test.c
@@ -16,7 +16,7 @@
 
 /** Performance tests for lists of fr_pair_t
  *
- * @file src/lib/util/pair_list_perf_test.c
+ * @file src/lib/util/test//pair_list_perf_test.c
  * @author Nick Porter <nick.porter@networkradius.com>
  *
  * @copyright 2021 Network RADIUS SAS <legal@networkradius.com>
@@ -40,7 +40,7 @@ static void pair_list_perf_init(void);
 #define TEST_INIT pair_list_perf_init()
 #endif
 
-#include <freeradius-devel/util/acutest.h>
+#include "acutest.h"
 
 #ifdef WITH_VERIFY_PTR
 #undef WITH_VERIFY_PTR

diff --git a/src/lib/util/pair_list_perf_test.mk b/src/lib/util/test/pair_list_perf_test.mk
similarity index 100%
rename from src/lib/util/pair_list_perf_test.mk
rename to src/lib/util/test/pair_list_perf_test.mk

diff --git a/src/lib/util/pair_nested_tests.c b/src/lib/util/test/pair_nested_tests.c
similarity index 100%
rename from src/lib/util/pair_nested_tests.c
rename to src/lib/util/test/pair_nested_tests.c

diff --git a/src/lib/util/pair_nested_tests.mk b/src/lib/util/test/pair_nested_tests.mk
similarity index 100%
rename from src/lib/util/pair_nested_tests.mk
rename to src/lib/util/test/pair_nested_tests.mk

diff --git a/src/lib/util/pair_test_helpers.h b/src/lib/util/test/pair_test_helpers.h
similarity index 97%
rename from src/lib/util/pair_test_helpers.h
rename to src/lib/util/test/pair_test_helpers.h
index b262990221231c418f9a6334edcb5a7cd6b4c2ce..04ba88637f1417e6a1094625ec919079fdfd8a12 100644 (file)
--- a/src/lib/util/pair_test_helpers.h
+++ b/src/lib/util/test/pair_test_helpers.h
@@ -17,7 +17,7 @@
 
 /** Helper functions for pair tests
  *
- * @file src/lib/util/pair_test_helpers.h
+ * @file src/lib/util/test//pair_test_helpers.h
  *
  * @copyright 2021 The FreeRADIUS server project
  */

diff --git a/src/lib/util/pair_tests.c b/src/lib/util/test/pair_tests.c
similarity index 99%
rename from src/lib/util/pair_tests.c
rename to src/lib/util/test/pair_tests.c
index 2d0833b42127b9f2b2d42fb401a7c9dfa4aacf6b..e303433d9039b3faacf37bbf10455b8ef26efb82 100644 (file)
--- a/src/lib/util/pair_tests.c
+++ b/src/lib/util/test/pair_tests.c
@@ -16,7 +16,7 @@
 
 /** Tests for a AVP manipulation and search API.
  *
- * @file src/lib/util/pair_tests.c
+ * @file src/lib/util/test//pair_tests.c
  * @author Jorge Pereira <jpereira@freeradius.org>
  * @copyright 2020 Network RADIUS SAS (legal@networkradius.com)
  */
@@ -39,9 +39,9 @@ static void test_init(void);
 #      define TEST_INIT  test_init()
 #endif
 
-#include <freeradius-devel/util/acutest.h>
-#include <freeradius-devel/util/acutest_helpers.h>
-#include <freeradius-devel/util/pair_test_helpers.h>
+#include "acutest.h"
+#include"acutest_helpers.h"
+#include "pair_test_helpers.h"
 
 #include <freeradius-devel/util/conf.h>
 #include <freeradius-devel/util/dict.h>

diff --git a/src/lib/util/pair_tests.mk b/src/lib/util/test/pair_tests.mk
similarity index 100%
rename from src/lib/util/pair_tests.mk
rename to src/lib/util/test/pair_tests.mk

diff --git a/src/lib/util/rb_tests.c b/src/lib/util/test/rb_tests.c
similarity index 97%
rename from src/lib/util/rb_tests.c
rename to src/lib/util/test/rb_tests.c
index 71add2c290d8613d49d1f11432f4c85b736c32dc..4971a1635ff1731172a3528cd4344d4ee9a9d6e0 100644 (file)
--- a/src/lib/util/rb_tests.c
+++ b/src/lib/util/test/rb_tests.c
@@ -16,12 +16,12 @@
 
 /** Tests for rbtrees
  *
- * @file src/lib/util/rb_tests.c
+ * @file src/lib/util/test//rb_tests.c
  *
  * @copyright 2021 Arran Cudbard-Bell <a.cudbardb@freeradius.org>
  */
-#include <freeradius-devel/util/acutest.h>
-#include <freeradius-devel/util/acutest_helpers.h>
+#include "acutest.h"
+#include"acutest_helpers.h"
 #include <freeradius-devel/util/rand.h>
 #include <freeradius-devel/util/rb.h>
 

diff --git a/src/lib/util/rb_tests.mk b/src/lib/util/test/rb_tests.mk
similarity index 100%
rename from src/lib/util/rb_tests.mk
rename to src/lib/util/test/rb_tests.mk

diff --git a/src/lib/util/sbuff_tests.c b/src/lib/util/test/sbuff_tests.c
similarity index 99%
rename from src/lib/util/sbuff_tests.c
rename to src/lib/util/test/sbuff_tests.c
index d37599f19efa45864cc02a1f88b857165769f29f..8d985d72238603f056545b9821a29fb19d05182f 100644 (file)
--- a/src/lib/util/sbuff_tests.c
+++ b/src/lib/util/test/sbuff_tests.c
@@ -16,14 +16,14 @@
 
 /** Tests for a generic string buffer structure for string printing and parsing
  *
- * @file src/lib/util/sbuff_tests.c
+ * @file src/lib/util/test//sbuff_tests.c
  *
  * @copyright 2020 Arran Cudbard-Bell <a.cudbardb@freeradius.org>
  */
-#include <freeradius-devel/util/acutest.h>
-#include <freeradius-devel/util/acutest_helpers.h>
+#include "acutest.h"
+#include"acutest_helpers.h"
 
-#include "sbuff.h"
+#include <freeradius-devel/util/sbuff.h>
 
 //#include <gperftools/profiler.h>
 

diff --git a/src/lib/util/sbuff_tests.mk b/src/lib/util/test/sbuff_tests.mk
similarity index 100%
rename from src/lib/util/sbuff_tests.mk
rename to src/lib/util/test/sbuff_tests.mk

diff --git a/src/lib/util/size_tests.c b/src/lib/util/test/size_tests.c
similarity index 98%
rename from src/lib/util/size_tests.c
rename to src/lib/util/test/size_tests.c
index e5f4b7f6df096b6f5ccc66873c81fa997002f8c8..d4c60037ee3c9530349d0b17c4ccbe1c1686f366 100644 (file)
--- a/src/lib/util/size_tests.c
+++ b/src/lib/util/test/size_tests.c
@@ -16,12 +16,12 @@
 
 /** Size printing/parsing
  *
- * @file src/lib/util/size_tests.c
+ * @file src/lib/util/test//size_tests.c
  * @copyright Arran Cudbard-Bell (a.cudbardb@freeradius.org)
  */
 
-#include <freeradius-devel/util/acutest.h>
-#include <freeradius-devel/util/acutest_helpers.h>
+#include "acutest.h"
+#include"acutest_helpers.h"
 #include <freeradius-devel/util/size.h>
 
 #ifdef HAVE_GPERFTOOLS_PROFILER_H

diff --git a/src/lib/util/size_tests.mk b/src/lib/util/test/size_tests.mk
similarity index 100%
rename from src/lib/util/size_tests.mk
rename to src/lib/util/test/size_tests.mk

diff --git a/src/lib/util/slab_tests.c b/src/lib/util/test/slab_tests.c
similarity index 99%
rename from src/lib/util/slab_tests.c
rename to src/lib/util/test/slab_tests.c
index 4a971eb0c1d6ee9ce23b285c6f469cfa740efe0e..cc563a28735d5e14888febd6492109888e188603 100644 (file)
--- a/src/lib/util/slab_tests.c
+++ b/src/lib/util/test/slab_tests.c
@@ -1,13 +1,13 @@
 /** Tests for slab allocator
  *
- * @file src/lib/util/slab_tests.c
+ * @file src/lib/util/test//slab_tests.c
  *
  * @copyright 2023 Network RADIUS SAS <legal@networkradius.com>
  */
-#include <freeradius-devel/util/acutest.h>
-#include <freeradius-devel/util/acutest_helpers.h>
+#include "acutest.h"
+#include"acutest_helpers.h"
 #include <freeradius-devel/util/timer.h>
-#include "slab.h"
+#include <freeradius-devel/util/slab.h>
 
 typedef struct {
        int     num;

diff --git a/src/lib/util/slab_tests.mk b/src/lib/util/test/slab_tests.mk
similarity index 100%
rename from src/lib/util/slab_tests.mk
rename to src/lib/util/test/slab_tests.mk

diff --git a/src/lib/util/strerror_tests.c b/src/lib/util/test/strerror_tests.c
similarity index 97%
rename from src/lib/util/strerror_tests.c
rename to src/lib/util/test/strerror_tests.c
index 18a8599fc5f8b8052ab9738457c7ad54ffb9ebc7..ab07d5932842c700037b3a702371e7fe8e21058b 100644 (file)
--- a/src/lib/util/strerror_tests.c
+++ b/src/lib/util/test/strerror_tests.c
@@ -16,12 +16,12 @@
 
 /** Tests for a generic string buffer structure for string printing and parsing
  *
- * @file src/lib/util/strerror_tests.c
+ * @file src/lib/util/test//strerror_tests.c
  *
  * @copyright 2020 Arran Cudbard-Bell <a.cudbardb@freeradius.org>
  */
-#include <freeradius-devel/util/acutest.h>
-#include <freeradius-devel/util/acutest_helpers.h>
+#include "acutest.h"
+#include"acutest_helpers.h"
 #include <freeradius-devel/util/time.h>
 
 static void strerror_uninit(void)

diff --git a/src/lib/util/strerror_tests.mk b/src/lib/util/test/strerror_tests.mk
similarity index 100%
rename from src/lib/util/strerror_tests.mk
rename to src/lib/util/test/strerror_tests.mk

diff --git a/src/lib/util/time_tests.c b/src/lib/util/test/time_tests.c
similarity index 92%
rename from src/lib/util/time_tests.c
rename to src/lib/util/test/time_tests.c
index 8e667d8c2c364f7308f05297bb9f5de6955156b7..7d420841968fa866b59a344dca0062946b62609f 100644 (file)
--- a/src/lib/util/time_tests.c
+++ b/src/lib/util/test/time_tests.c
@@ -16,12 +16,12 @@
 
 /** Tests for a generic string buffer structure for string printing and parsing
  *
- * @file src/lib/util/time_tests.c
+ * @file src/lib/util/test//time_tests.c
  *
  * @copyright 2022 Arran Cudbard-Bell <a.cudbardb@freeradius.org>
  */
-#include <freeradius-devel/util/acutest.h>
-#include <freeradius-devel/util/acutest_helpers.h>
+#include "acutest.h"
+#include"acutest_helpers.h"
 #include <freeradius-devel/util/time.h>
 
 #define ROUNDS (100000)

diff --git a/src/lib/util/time_tests.mk b/src/lib/util/test/time_tests.mk
similarity index 100%
rename from src/lib/util/time_tests.mk
rename to src/lib/util/test/time_tests.mk

diff --git a/src/lib/util/timer_tests.c b/src/lib/util/test/timer_tests.c
similarity index 98%
rename from src/lib/util/timer_tests.c
rename to src/lib/util/test/timer_tests.c
index 95bcdb4b003f11307f99a98a03594d77866e8aa6..01e3ac3e5567d11c077b8792411fbd722a8da309 100644 (file)
--- a/src/lib/util/timer_tests.c
+++ b/src/lib/util/test/timer_tests.c
@@ -16,12 +16,12 @@
 
 /** Tests for timer lists
  *
- * @file src/lib/util/timer_tests.c
+ * @file src/lib/util/test//timer_tests.c
  *
  * @copyright 2025 Arran Cudbard-Bell <a.cudbardb@freeradius.org>
  */
-#include <freeradius-devel/util/acutest.h>
-#include <freeradius-devel/util/acutest_helpers.h>
+#include "acutest.h"
+#include"acutest_helpers.h"
 #include <freeradius-devel/util/time.h>
 #include <freeradius-devel/util/timer.h>
 

diff --git a/src/lib/util/timer_tests.mk b/src/lib/util/test/timer_tests.mk
similarity index 100%
rename from src/lib/util/timer_tests.mk
rename to src/lib/util/test/timer_tests.mk