define and use TEST_TERMINATOR

diff --git a/src/lib/server/pair_server_tests.c b/src/lib/server/pair_server_tests.c
index 4d436c356ca8bc9fd15ead09969c109ab44d8a37..be4caf3f7eaeb99f6991e722e6445fa8cd8e349f 100644 (file)
--- a/src/lib/server/pair_server_tests.c
+++ b/src/lib/server/pair_server_tests.c
@@ -370,5 +370,5 @@ TEST_LIST = {
        { "pair_delete_control",       test_pair_delete_control },
        { "pair_delete_session_state", test_pair_delete_session_state },
 
-       { NULL }
+       TEST_TERMINATOR
 };

diff --git a/src/lib/server/tmpl_dcursor_tests.c b/src/lib/server/tmpl_dcursor_tests.c
index 8e33594e967fde61f7fd11866683713495c01fc2..2324e5ef09de69c826d38f2dc56ff51c884801c0 100644 (file)
--- a/src/lib/server/tmpl_dcursor_tests.c
+++ b/src/lib/server/tmpl_dcursor_tests.c
@@ -832,7 +832,7 @@ TEST_LIST = {
        { "test_level_3_build_invalid1",        test_level_3_build_invalid1 },
        { "test_level_3_build_invalid2",        test_level_3_build_invalid2 },
 
-       { NULL }
+       TEST_TERMINATOR
 };
 
 DIAG_ON(declaration-after-statement)

diff --git a/src/lib/server/trunk_tests.c b/src/lib/server/trunk_tests.c
index 875682766866ce550da2d488cf7de091789593aa..b3486d82ec5f1887c70cc94b5968566a54154b5c 100644 (file)
--- a/src/lib/server/trunk_tests.c
+++ b/src/lib/server/trunk_tests.c
@@ -1968,5 +1968,5 @@ TEST_LIST = {
         *      Performance tests
         */
        { "Speed Test - Enqueue, and I/O",              test_enqueue_and_io_speed },
-       { NULL }
+       TEST_TERMINATOR
 };

diff --git a/src/lib/util/acutest.h b/src/lib/util/acutest.h
index 4393470f1fc10a2c72e494fd86b6da5b0e2319af..154806b7065cc469b6f78449c98479772cde966a 100644 (file)
--- a/src/lib/util/acutest.h
+++ b/src/lib/util/acutest.h
@@ -61,6 +61,8 @@
  */
 #define TEST_LIST               const struct acutest_test_ acutest_list_[]
 
+#define TEST_TERMINATOR { .name = NULL }
+
 
 /* Macros for testing whether an unit test succeeds or fails. These macros
  * can be used arbitrarily in functions implementing the unit tests.

diff --git a/src/lib/util/base_16_32_64_tests.c b/src/lib/util/base_16_32_64_tests.c
index b720c712649584b3d9cc5ef2a3b6563daa63bce2..4f5a78bb90be4f22c3931acba17d1f6bde8a3b2c 100644 (file)
--- a/src/lib/util/base_16_32_64_tests.c
+++ b/src/lib/util/base_16_32_64_tests.c
@@ -254,5 +254,5 @@ TEST_LIST = {
 
        { "base64.encode",              test_base64_encode },
        { "base64.decode",              test_base64_decode },
-       { NULL }
+       TEST_TERMINATOR
 };

diff --git a/src/lib/util/dbuff_tests.c b/src/lib/util/dbuff_tests.c
index 1ef0ceb9660a7ca820032941e0f7747341ada615..0360598eb956de1ebaf1939a84d018b7f3b25f2a 100644 (file)
--- a/src/lib/util/dbuff_tests.c
+++ b/src/lib/util/dbuff_tests.c
@@ -524,6 +524,6 @@ TEST_LIST = {
        { "fr_dbuff_out",                               test_dbuff_out },
 
 
-       { NULL }
+       TEST_TERMINATOR
 };
 

diff --git a/src/lib/util/dcursor_tests.c b/src/lib/util/dcursor_tests.c
index bc5d2533dcaf8e4437b31d5b1b99ab1123070cb4..76ea309c5465059091adc69e1ec607594af05d6b 100644 (file)
--- a/src/lib/util/dcursor_tests.c
+++ b/src/lib/util/dcursor_tests.c
@@ -1958,5 +1958,5 @@ TEST_LIST = {
        { "current",                    test_filter_current },
        { "no_match",                   test_filter_no_match },
 
-       { NULL }
+       TEST_TERMINATOR
 };

diff --git a/src/lib/util/dcursor_typed_tests.c b/src/lib/util/dcursor_typed_tests.c
index 348c9931d72169d1ba00172486a5a6d30e720ea6..52148e89a20835c19588660feff70c85c7429dcf 100644 (file)
--- a/src/lib/util/dcursor_typed_tests.c
+++ b/src/lib/util/dcursor_typed_tests.c
@@ -1855,5 +1855,5 @@ TEST_LIST = {
        { "current",            test_filter_current },
        { "no_match",           test_filter_no_match },
 
-       { NULL }
+       TEST_TERMINATOR
 };

diff --git a/src/lib/util/dlist_tests.c b/src/lib/util/dlist_tests.c
index 2b48ae4a46f4d7c0afb94ce7e27769e4362f56ac..38617a62d13af24c56f0e545935c0314a493fcfc 100644 (file)
--- a/src/lib/util/dlist_tests.c
+++ b/src/lib/util/dlist_tests.c
@@ -193,5 +193,5 @@ TEST_LIST = {
        { "fr_dlist_entry_move",        test_dlist_entry_move   },
        { "fr_dlist_foreach_safe",      test_dlist_foreach_safe },
 
-       { NULL }
+       TEST_TERMINATOR
 };

diff --git a/src/lib/util/edit_tests.c b/src/lib/util/edit_tests.c
index a16fac18c39d4892d495b4cff03844b924b1ff3a..209a0eafc34fc5502f8ef6311c6c1b4a9a832699 100644 (file)
--- a/src/lib/util/edit_tests.c
+++ b/src/lib/util/edit_tests.c
@@ -859,5 +859,5 @@ TEST_LIST = {
        { "pair_edit_child_value",              test_pair_edit_child_value },
        { "pair_edit_child_value_abort",        test_pair_edit_child_value_abort },
 
-       { NULL }
+       TEST_TERMINATOR
 };

diff --git a/src/lib/util/heap_tests.c b/src/lib/util/heap_tests.c
index c006faf8fd3f568f3d7e7104bf02b27050a18262..79c1bb7eaae283c8a954c2ab1d4703149e663326 100644 (file)
--- a/src/lib/util/heap_tests.c
+++ b/src/lib/util/heap_tests.c
@@ -312,6 +312,6 @@ TEST_LIST = {
        { "heap_test_order",            heap_test_order         },
        { "heap_iter",                  heap_iter               },
        { "heap_cycle",                 heap_cycle              },
-       { NULL }
+       TEST_TERMINATOR
 };
 

diff --git a/src/lib/util/hmac_tests.c b/src/lib/util/hmac_tests.c
index 1c96b7f8e46d88f7ab2c18ee7f9671d6d1786d8d..bd6e3a4fffbf1441db0cdddc2f84fad6ee6bc617 100644 (file)
--- a/src/lib/util/hmac_tests.c
+++ b/src/lib/util/hmac_tests.c
@@ -212,5 +212,5 @@ TEST_LIST = {
        { "hmac-md5",                   test_hmac_md5   },
        { "hmac-sha1",                  test_hmac_sha1  },
 
-       { NULL }
+       TEST_TERMINATOR
 };

diff --git a/src/lib/util/lst_tests.c b/src/lib/util/lst_tests.c
index b914fb756c814d2e9e6608ebab1582eecea2b932..4e7633ee52a2f40c12d940b059d6275f0712644a 100644 (file)
--- a/src/lib/util/lst_tests.c
+++ b/src/lib/util/lst_tests.c
@@ -578,5 +578,5 @@ TEST_LIST = {
        { "queue_cmp_50",       queue_cmp_50 },
        { "queue_cmp_100",      queue_cmp_100 },
        { "queue_cmp_1000",     queue_cmp_1000 },
-       { NULL }
+       TEST_TERMINATOR
 };

diff --git a/src/lib/util/minmax_heap_tests.c b/src/lib/util/minmax_heap_tests.c
index 2c350ec8a11b7466100f0c2696d2e3495a9b0dd8..3833888a9df9f801a6a4d832ff567d07d1d137bc 100644 (file)
--- a/src/lib/util/minmax_heap_tests.c
+++ b/src/lib/util/minmax_heap_tests.c
@@ -647,6 +647,6 @@ TEST_LIST = {
        { "queue_cmp_50",       queue_cmp_50 },
        { "queue_cmp_100",      queue_cmp_100 },
        { "queue_cmp_1000",     queue_cmp_1000 },
-       { NULL }
+       TEST_TERMINATOR
 };
 

diff --git a/src/lib/util/pair_legacy_tests.c b/src/lib/util/pair_legacy_tests.c
index 5ebf6e1c8d778fd8525d9a2be06fc7f78e912ba9..a4022e970a63cab42bfe7bd553f8d8320602d76a 100644 (file)
--- a/src/lib/util/pair_legacy_tests.c
+++ b/src/lib/util/pair_legacy_tests.c
@@ -223,5 +223,5 @@ TEST_LIST = {
        { "fr_pair_list_afrom_file", test_fr_pair_list_afrom_file },
        { "fr_pair_list_move_op",       test_fr_pair_list_move_op },
 
-       { NULL }
+       TEST_TERMINATOR
 };

diff --git a/src/lib/util/pair_list_perf_test.c b/src/lib/util/pair_list_perf_test.c
index e8a06941cf3ae5ee40d54030fa42b488b1dc9235..03586e9acb6f01947a838a9b36ef62e2afc60f82 100644 (file)
--- a/src/lib/util/pair_list_perf_test.c
+++ b/src/lib/util/pair_list_perf_test.c
@@ -525,5 +525,5 @@ TEST_LIST = {
        all_repetition_tests(find_nth)
        all_repetition_tests(fr_pair_list_free)
 
-       { NULL }
+       TEST_TERMINATOR
 };

diff --git a/src/lib/util/pair_tests.c b/src/lib/util/pair_tests.c
index 3486edef1dea24cd88ce7f3d4aabe4dc469c9685..2d0833b42127b9f2b2d42fb401a7c9dfa4aacf6b 100644 (file)
--- a/src/lib/util/pair_tests.c
+++ b/src/lib/util/pair_tests.c
@@ -1368,5 +1368,5 @@ TEST_LIST = {
        { "fr_pair_value_enum",                   test_fr_pair_value_enum },
        { "fr_pair_value_enum_box",               test_fr_pair_value_enum_box },
 
-       { NULL }
+       TEST_TERMINATOR
 };

diff --git a/src/lib/util/rb_tests.c b/src/lib/util/rb_tests.c
index 11e84054e7061405fd61c25bcd5982ca066d6b84..ec254e2e69f2c15e1eb75cd16b827410134491f4 100644 (file)
--- a/src/lib/util/rb_tests.c
+++ b/src/lib/util/rb_tests.c
@@ -216,5 +216,5 @@ TEST_LIST = {
        { "fr_rb_iter_postorder",          test_fr_rb_iter_postorder },
        { "fr_rb_iter_delete",             test_fr_rb_iter_delete },
 
-       { NULL }
+       TEST_TERMINATOR
 };

diff --git a/src/lib/util/sbuff_tests.c b/src/lib/util/sbuff_tests.c
index cfb2130fd1c8f7bc3a1f812e05e4715ccb33a3ed..d37599f19efa45864cc02a1f88b857165769f29f 100644 (file)
--- a/src/lib/util/sbuff_tests.c
+++ b/src/lib/util/sbuff_tests.c
@@ -1642,5 +1642,5 @@ TEST_LIST = {
        { "fr_sbuff_next_if_char",              test_next_if_char },
        { "fr_sbuff_next_unless_char",          test_next_unless_char },
 
-       { NULL }
+       TEST_TERMINATOR
 };

diff --git a/src/lib/util/size_tests.c b/src/lib/util/size_tests.c
index 4f99193b734ba5511e3506ef05412ad798142acd..e5f4b7f6df096b6f5ccc66873c81fa997002f8c8 100644 (file)
--- a/src/lib/util/size_tests.c
+++ b/src/lib/util/size_tests.c
@@ -336,5 +336,5 @@ TEST_LIST = {
        { "print_base2",                        test_size_print_base2 },
        { "print_base10",                       test_size_print_base10 },
 
-       { NULL }
+       TEST_TERMINATOR
 };

diff --git a/src/lib/util/slab_tests.c b/src/lib/util/slab_tests.c
index ef3617a530399115a13591350b250fe10e7be867..920043b2439d162f1cb9080cb8bb988b3adf0f48 100644 (file)
--- a/src/lib/util/slab_tests.c
+++ b/src/lib/util/slab_tests.c
@@ -804,5 +804,5 @@ TEST_LIST = {
        { "test_realloc",       test_realloc },
        { "test_child_alloc",   test_child_alloc },
 
-       { NULL }
+       TEST_TERMINATOR
 };

diff --git a/src/lib/util/timer_tests.c b/src/lib/util/timer_tests.c
index 283c5cf6555ee3b5436a9702e3710edd31947ff2..95bcdb4b003f11307f99a98a03594d77866e8aa6 100644 (file)
--- a/src/lib/util/timer_tests.c
+++ b/src/lib/util/timer_tests.c
@@ -404,5 +404,5 @@ TEST_LIST = {
        { "ordered_bad_inserts",        ordered_bad_inserts_test },
        { "lst_nested",         lst_nested },
        { "ordered_nested",             ordered_nested },
-       { NULL }
+       TEST_TERMINATOR
 };