tests: upgrade deprecated cmocka test runner

5 files changed, 36 insertions, 36 deletions

diff --git a/tests/blogc-make/check_atom.c b/tests/blogc-make/check_atom.c
index 6be03d9..e93bc76 100644
--- a/tests/blogc-make/check_atom.c
+++ b/tests/blogc-make/check_atom.c
@@ -536,17 +536,17 @@ test_atom_legacy_entry_id(void **state)
 int
 main(void)
 {
-    const UnitTest tests[] = {
-        unit_test(test_atom_generate_empty_file),
-        unit_test(test_atom_generate_empty_dir),
-        unit_test(test_atom_generate_file),
-        unit_test(test_atom_generate_dir),
-        unit_test(test_atom_empty_file),
-        unit_test(test_atom_empty_dir),
-        unit_test(test_atom_file),
-        unit_test(test_atom_dir),
-        unit_test(test_atom_legacy_entry_id_empty),
-        unit_test(test_atom_legacy_entry_id),
+    const struct CMUnitTest tests[] = {
+        cmocka_unit_test(test_atom_generate_empty_file),
+        cmocka_unit_test(test_atom_generate_empty_dir),
+        cmocka_unit_test(test_atom_generate_file),
+        cmocka_unit_test(test_atom_generate_dir),
+        cmocka_unit_test(test_atom_empty_file),
+        cmocka_unit_test(test_atom_empty_dir),
+        cmocka_unit_test(test_atom_file),
+        cmocka_unit_test(test_atom_dir),
+        cmocka_unit_test(test_atom_legacy_entry_id_empty),
+        cmocka_unit_test(test_atom_legacy_entry_id),
     };
-    return run_tests(tests);
+    return cmocka_run_group_tests(tests, NULL, NULL);
 }
diff --git a/tests/blogc-make/check_exec.c b/tests/blogc-make/check_exec.c
index 6812496..6b15423 100644
--- a/tests/blogc-make/check_exec.c
+++ b/tests/blogc-make/check_exec.c
@@ -304,15 +304,15 @@ test_build_blogc_cmd_print(void **state)
 int
 main(void)
 {
-    const UnitTest tests[] = {
+    const struct CMUnitTest tests[] = {
 #ifndef MAKE_EMBEDDED
-        unit_test(test_find_binary),
+        cmocka_unit_test(test_find_binary),
 #endif
-        unit_test(test_build_blogc_cmd_with_settings),
-        unit_test(test_build_blogc_cmd_with_settings_and_dev),
-        unit_test(test_build_blogc_cmd_with_settings_and_tags),
-        unit_test(test_build_blogc_cmd_without_settings),
-        unit_test(test_build_blogc_cmd_print),
+        cmocka_unit_test(test_build_blogc_cmd_with_settings),
+        cmocka_unit_test(test_build_blogc_cmd_with_settings_and_dev),
+        cmocka_unit_test(test_build_blogc_cmd_with_settings_and_tags),
+        cmocka_unit_test(test_build_blogc_cmd_without_settings),
+        cmocka_unit_test(test_build_blogc_cmd_print),
     };
-    return run_tests(tests);
+    return cmocka_run_group_tests(tests, NULL, NULL);
 }
diff --git a/tests/blogc-make/check_rules.c b/tests/blogc-make/check_rules.c
index ed2e46a..5da412f 100644
--- a/tests/blogc-make/check_rules.c
+++ b/tests/blogc-make/check_rules.c
@@ -96,9 +96,9 @@ test_rule_parse_args_error(void **state)
 int
 main(void)
 {
-    const UnitTest tests[] = {
-        unit_test(test_rule_parse_args),
-        unit_test(test_rule_parse_args_error),
+    const struct CMUnitTest tests[] = {
+        cmocka_unit_test(test_rule_parse_args),
+        cmocka_unit_test(test_rule_parse_args_error),
     };
-    return run_tests(tests);
+    return cmocka_run_group_tests(tests, NULL, NULL);
 }
diff --git a/tests/blogc-make/check_settings.c b/tests/blogc-make/check_settings.c
index 7cebedc..d942c45 100644
--- a/tests/blogc-make/check_settings.c
+++ b/tests/blogc-make/check_settings.c
@@ -348,13 +348,13 @@ test_settings_copy_files(void **state)
 int
 main(void)
 {
-    const UnitTest tests[] = {
-        unit_test(test_settings_empty),
-        unit_test(test_settings),
-        unit_test(test_settings_env),
-        unit_test(test_settings2),
-        unit_test(test_settings_env2),
-        unit_test(test_settings_copy_files),
+    const struct CMUnitTest tests[] = {
+        cmocka_unit_test(test_settings_empty),
+        cmocka_unit_test(test_settings),
+        cmocka_unit_test(test_settings_env),
+        cmocka_unit_test(test_settings2),
+        cmocka_unit_test(test_settings_env2),
+        cmocka_unit_test(test_settings_copy_files),
     };
-    return run_tests(tests);
+    return cmocka_run_group_tests(tests, NULL, NULL);
 }
diff --git a/tests/blogc-make/check_utils.c b/tests/blogc-make/check_utils.c
index 5b3614d..09d1580 100644
--- a/tests/blogc-make/check_utils.c
+++ b/tests/blogc-make/check_utils.c
@@ -460,9 +460,9 @@ test_generate_filename2(void **state)
 int
 main(void)
 {
-    const UnitTest tests[] = {
-        unit_test(test_generate_filename),
-        unit_test(test_generate_filename2),
+    const struct CMUnitTest tests[] = {
+        cmocka_unit_test(test_generate_filename),
+        cmocka_unit_test(test_generate_filename2),
     };
-    return run_tests(tests);
+    return cmocka_run_group_tests(tests, NULL, NULL);
 }