From: Vladimír Čunát Date: Tue, 16 Dec 2025 14:17:27 +0000 (+0100) Subject: tests: migrate off cmocka's deprecated APIs X-Git-Tag: v6.1.0~10^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4eaf8e69cc9839f68b613d0be10103e05c57fe9;p=thirdparty%2Fknot-resolver.git tests: migrate off cmocka's deprecated APIs With cmocka-2.0.0 these broke. I'm not sure if upstream meant to break them, but either way we'd better avoid deprecated APIs. --- diff --git a/daemon/ratelimiting.test/tests.inc.c b/daemon/ratelimiting.test/tests.inc.c index e1854cb38..2ab7b7071 100644 --- a/daemon/ratelimiting.test/tests.inc.c +++ b/daemon/ratelimiting.test/tests.inc.c @@ -127,15 +127,15 @@ int main(int argc, char *argv[]) { assert(KRU_GENERIC.initialize != KRU_AVX2.initialize); if (KRU.initialize == KRU_AVX2.initialize) { - const UnitTest tests[] = { - unit_test(test_rrl_generic), - unit_test(test_rrl_avx2) + const struct CMUnitTest tests[] = { + cmocka_unit_test(test_rrl_generic), + cmocka_unit_test(test_rrl_avx2) }; - return run_tests(tests); + return cmocka_run_group_tests(tests, NULL, NULL); } else { - const UnitTest tests[] = { - unit_test(test_rrl_generic) + const struct CMUnitTest tests[] = { + cmocka_unit_test(test_rrl_generic) }; - return run_tests(tests); + return cmocka_run_group_tests(tests, NULL, NULL); } } diff --git a/lib/generic/test_array.c b/lib/generic/test_array.c index 3e95b4973..903e4cc53 100644 --- a/lib/generic/test_array.c +++ b/lib/generic/test_array.c @@ -90,10 +90,10 @@ int main(void) { test_mm_ctx_init(&global_mm); - const UnitTest tests[] = { - unit_test(test_array), - unit_test(test_array_mm) + const struct CMUnitTest tests[] = { + cmocka_unit_test(test_array), + cmocka_unit_test(test_array_mm) }; - return run_tests(tests); + return cmocka_run_group_tests(tests, NULL, NULL); } diff --git a/lib/generic/test_lru.c b/lib/generic/test_lru.c index 7c2f11f05..6101b402c 100644 --- a/lib/generic/test_lru.c +++ b/lib/generic/test_lru.c @@ -82,30 +82,30 @@ static void test_eviction(void **state) } } -static void test_init(void **state) +static int test_init(void **state) { lru_int_t *lru; lru_create(&lru, HASH_SIZE, NULL, NULL); assert_non_null(lru); *state = lru; + return 0; } -static void test_deinit(void **state) +static int test_deinit(void **state) { lru_int_t *lru = *state; lru_free(lru); + return 0; } /* Program entry point */ int main(int argc, char **argv) { - const UnitTest tests[] = { - group_test_setup(test_init), - unit_test(test_insert), - unit_test(test_missing), - unit_test(test_eviction), - group_test_teardown(test_deinit) + const struct CMUnitTest tests[] = { + cmocka_unit_test(test_insert), + cmocka_unit_test(test_missing), + cmocka_unit_test(test_eviction), }; - return run_group_tests(tests); + return cmocka_run_group_tests(tests, test_init, test_deinit); } diff --git a/lib/generic/test_pack.c b/lib/generic/test_pack.c index e1c1ab596..e8d68b487 100644 --- a/lib/generic/test_pack.c +++ b/lib/generic/test_pack.c @@ -60,9 +60,9 @@ int main(void) { test_mm_ctx_init(&global_mm); - const UnitTest tests[] = { - unit_test(test_pack_std), + const struct CMUnitTest tests[] = { + cmocka_unit_test(test_pack_std), }; - return run_tests(tests); + return cmocka_run_group_tests(tests, NULL, NULL); } diff --git a/lib/generic/test_queue.c b/lib/generic/test_queue.c index eb26b01a9..adec8a057 100644 --- a/lib/generic/test_queue.c +++ b/lib/generic/test_queue.c @@ -62,10 +62,10 @@ static void test_int(void **state_) int main(void) { - const UnitTest tests[] = { - unit_test(test_int), + const struct CMUnitTest tests[] = { + cmocka_unit_test(test_int), }; - return run_tests(tests); + return cmocka_run_group_tests(tests, NULL, NULL); } diff --git a/lib/generic/test_trie.c b/lib/generic/test_trie.c index ce164906d..f31e3d723 100644 --- a/lib/generic/test_trie.c +++ b/lib/generic/test_trie.c @@ -33,11 +33,12 @@ static const char *dict[] = { #define KEY_LEN(x) (strlen(x) + 1) static const int dict_size = sizeof(dict) / sizeof(const char *); -static void test_init(void **state) +static int test_init(void **state) { trie_t *t = trie_create(NULL); assert_non_null(t); *state = t; + return 0; } static void test_insert(void **state) @@ -129,26 +130,25 @@ static void test_leq_bug(void **state) trie_free(t); } -static void test_deinit(void **state) +static int test_deinit(void **state) { trie_t *t = *state; trie_free(t); *state = NULL; + return 0; } /* Program entry point */ int main(int argc, char **argv) { - const UnitTest tests[] = { - group_test_setup(test_init), - unit_test(test_insert), - unit_test(test_leq_bug), - unit_test(test_missing), - unit_test(test_iter), - unit_test(test_queue), - group_test_teardown(test_deinit) + const struct CMUnitTest tests[] = { + cmocka_unit_test(test_insert), + cmocka_unit_test(test_leq_bug), + cmocka_unit_test(test_missing), + cmocka_unit_test(test_iter), + cmocka_unit_test(test_queue), }; - return run_group_tests(tests); + return cmocka_run_group_tests(tests, test_init, test_deinit); } diff --git a/lib/test_module.c b/lib/test_module.c index d7124c19d..d26a27c39 100644 --- a/lib/test_module.c +++ b/lib/test_module.c @@ -29,11 +29,11 @@ static void test_module_c(void **state) int main(void) { - const UnitTest tests[] = { - unit_test(test_module_params), - unit_test(test_module_builtin), - unit_test(test_module_c), + const struct CMUnitTest tests[] = { + cmocka_unit_test(test_module_params), + cmocka_unit_test(test_module_builtin), + cmocka_unit_test(test_module_c), }; - return run_tests(tests); + return cmocka_run_group_tests(tests, NULL, NULL); } diff --git a/lib/test_rplan.c b/lib/test_rplan.c index 12f4cc488..f02c8f4b5 100644 --- a/lib/test_rplan.c +++ b/lib/test_rplan.c @@ -65,11 +65,11 @@ static void test_rplan_flags(void **state) int main(void) { - const UnitTest tests[] = { - unit_test(test_rplan_params), - unit_test(test_rplan_push), - unit_test(test_rplan_flags) + const struct CMUnitTest tests[] = { + cmocka_unit_test(test_rplan_params), + cmocka_unit_test(test_rplan_push), + cmocka_unit_test(test_rplan_flags) }; - return run_tests(tests); + return cmocka_run_group_tests(tests, NULL, NULL); } diff --git a/lib/test_utils.c b/lib/test_utils.c index 22f2483d8..5cc0853a5 100644 --- a/lib/test_utils.c +++ b/lib/test_utils.c @@ -136,12 +136,12 @@ static void test_strptime_diff(void **state) int main(void) { - const UnitTest tests[] = { - unit_test(test_strcatdup), - unit_test(test_straddr), - unit_test(test_bitmask), - unit_test(test_strptime_diff) + const struct CMUnitTest tests[] = { + cmocka_unit_test(test_strcatdup), + cmocka_unit_test(test_straddr), + cmocka_unit_test(test_bitmask), + cmocka_unit_test(test_strptime_diff) }; - return run_tests(tests); + return cmocka_run_group_tests(tests, NULL, NULL); } diff --git a/lib/test_zonecut.c b/lib/test_zonecut.c index c03996366..1f76a0a66 100644 --- a/lib/test_zonecut.c +++ b/lib/test_zonecut.c @@ -49,10 +49,10 @@ static void test_zonecut_copy(void **state) int main(void) { - const UnitTest tests[] = { - unit_test(test_zonecut_params), - unit_test(test_zonecut_copy) + const struct CMUnitTest tests[] = { + cmocka_unit_test(test_zonecut_params), + cmocka_unit_test(test_zonecut_copy) }; - return run_tests(tests); + return cmocka_run_group_tests(tests, NULL, NULL); }