[PATCH] tests: Refactor to be compatible with recent check API

2 views
Skip to first unread message

Jan Kiszka

unread,
Feb 22, 2022, 11:45:15 AM2/22/22
to efibootguard-dev
From: Jan Kiszka <jan.k...@siemens.com>

Macro magic happens, and the signature of tcase_add_test changed. So we
can no longer feed the tests as TFun to the registration service but
need to unroll the loops instead.

Signed-off-by: Jan Kiszka <jan.k...@siemens.com>
---
tools/tests/test_ebgenv_api.c | 28 ++++++++++----------------
tools/tests/test_ebgenv_api_internal.c | 28 ++++++++++----------------
2 files changed, 22 insertions(+), 34 deletions(-)

diff --git a/tools/tests/test_ebgenv_api.c b/tools/tests/test_ebgenv_api.c
index 740211a..9623bb7 100644
--- a/tools/tests/test_ebgenv_api.c
+++ b/tools/tests/test_ebgenv_api.c
@@ -653,25 +653,19 @@ Suite *ebg_test_suite(void)

s = suite_create("ebgenv_api");

- TFun tfuncs[] = {
- ebgenv_api_ebg_env_create_new,
- ebgenv_api_ebg_env_open_current,
- ebgenv_api_ebg_env_get,
- ebgenv_api_ebg_env_set,
- ebgenv_api_ebg_env_set_ex,
- ebgenv_api_ebg_env_get_ex,
- ebgenv_api_ebg_env_user_free,
- ebgenv_api_ebg_env_getglobalstate,
- ebgenv_api_ebg_env_setglobalstate,
- ebgenv_api_ebg_env_close,
- ebgenv_api_ebg_env_register_gc_var
- };
-
tc_core = tcase_create("Core");

- for (int i = 0; i < sizeof(tfuncs)/sizeof(void *); i++) {
- tcase_add_test(tc_core, tfuncs[i]);
- }
+ tcase_add_test(tc_core, ebgenv_api_ebg_env_create_new);
+ tcase_add_test(tc_core, ebgenv_api_ebg_env_open_current);
+ tcase_add_test(tc_core, ebgenv_api_ebg_env_get);
+ tcase_add_test(tc_core, ebgenv_api_ebg_env_set);
+ tcase_add_test(tc_core, ebgenv_api_ebg_env_set_ex);
+ tcase_add_test(tc_core, ebgenv_api_ebg_env_get_ex);
+ tcase_add_test(tc_core, ebgenv_api_ebg_env_user_free);
+ tcase_add_test(tc_core, ebgenv_api_ebg_env_getglobalstate);
+ tcase_add_test(tc_core, ebgenv_api_ebg_env_setglobalstate);
+ tcase_add_test(tc_core, ebgenv_api_ebg_env_close);
+ tcase_add_test(tc_core, ebgenv_api_ebg_env_register_gc_var);

suite_add_tcase(s, tc_core);

diff --git a/tools/tests/test_ebgenv_api_internal.c b/tools/tests/test_ebgenv_api_internal.c
index 795375f..0d70a7c 100644
--- a/tools/tests/test_ebgenv_api_internal.c
+++ b/tools/tests/test_ebgenv_api_internal.c
@@ -434,25 +434,19 @@ Suite *ebg_test_suite(void)

s = suite_create("ebgenv_api");

- TFun tfuncs[] = {
- ebgenv_api_internal_strXtoY,
- ebgenv_api_internal_bgenv_str2enum,
- ebgenv_api_internal_bgenv_open_by_index,
- ebgenv_api_internal_bgenv_open_oldest,
- ebgenv_api_internal_bgenv_open_latest,
- ebgenv_api_internal_bgenv_write,
- ebgenv_api_internal_bgenv_read,
- ebgenv_api_internal_bgenv_create_new,
- ebgenv_api_internal_bgenv_get,
- ebgenv_api_internal_bgenv_set,
- ebgenv_api_internal_uservars
- };
-
tc_core = tcase_create("Core");

- for (int i = 0; i < sizeof(tfuncs)/sizeof(void *); i++) {
- tcase_add_test(tc_core, tfuncs[i]);
- }
+ tcase_add_test(tc_core, ebgenv_api_internal_strXtoY);
+ tcase_add_test(tc_core, ebgenv_api_internal_bgenv_str2enum);
+ tcase_add_test(tc_core, ebgenv_api_internal_bgenv_open_by_index);
+ tcase_add_test(tc_core, ebgenv_api_internal_bgenv_open_oldest);
+ tcase_add_test(tc_core, ebgenv_api_internal_bgenv_open_latest);
+ tcase_add_test(tc_core, ebgenv_api_internal_bgenv_write);
+ tcase_add_test(tc_core, ebgenv_api_internal_bgenv_read);
+ tcase_add_test(tc_core, ebgenv_api_internal_bgenv_create_new);
+ tcase_add_test(tc_core, ebgenv_api_internal_bgenv_get);
+ tcase_add_test(tc_core, ebgenv_api_internal_bgenv_set);
+ tcase_add_test(tc_core, ebgenv_api_internal_uservars);

suite_add_tcase(s, tc_core);

--
2.34.1
Reply all
Reply to author
Forward
0 new messages