change option descriptor test setup

diff --git a/tests/kds_s2000w_option_descriptor_tests.c b/tests/kds_s2000w_option_descriptor_tests.c
index 93c13c8f6f9c615969ab6793f7549efe53e0c572..572338637f81e31a84f0ceaffd8bb26f84991322 100644 (file)
--- a/tests/kds_s2000w_option_descriptor_tests.c
+++ b/tests/kds_s2000w_option_descriptor_tests.c
@@ -870,59 +870,59 @@ void kds_s2000w_option_full_get_descriptor_over_max_options_test()
 int main()
 {
        const struct CMUnitTest option_descriptor_tests[] = {
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_zero_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_one_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_two_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_three_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_four_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_five_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_six_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_seven_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_eight_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_nine_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_ten_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_eleven_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_twelve_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_thirdteen_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_fourteen_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_fifteen_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_sixteen_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_seventeen_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_eightteen_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_nineteen_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_twenty_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_twentyone_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_twentytwo_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_twentythree_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_twentyfour_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_twentyfive_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_twentysix_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_twentyseven_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_twentyeight_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_twentynine_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_thirdy_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_thirdyone_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_thirdytwo_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_thirdythree_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_thirdyfour_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_thirdyfive_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_thirdysix_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_thirdyseven_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_thirdyeight_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_thirdynine_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_fourty_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_fourtyone_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_fourtytwo_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_fourtythree_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_fourtyfour_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_fourtyfive_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_fourtysix_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_fourtyseven_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_get_by_config_name_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_get_descriptor_over_max_options_test, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_full_get_descriptor_by_number, setup, teardown),
-               cmocka_unit_test_setup_teardown(kds_s2000w_option_full_get_descriptor_over_max_options_test, setup, teardown),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_zero_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_one_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_two_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_three_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_four_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_five_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_six_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_seven_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_eight_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_nine_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_ten_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_eleven_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_twelve_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_thirdteen_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_fourteen_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_fifteen_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_sixteen_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_seventeen_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_eightteen_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_nineteen_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_twenty_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_twentyone_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_twentytwo_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_twentythree_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_twentyfour_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_twentyfive_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_twentysix_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_twentyseven_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_twentyeight_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_twentynine_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_thirdy_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_thirdyone_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_thirdytwo_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_thirdythree_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_thirdyfour_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_thirdyfive_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_thirdysix_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_thirdyseven_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_thirdyeight_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_thirdynine_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_fourty_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_fourtyone_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_fourtytwo_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_fourtythree_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_fourtyfour_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_fourtyfive_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_fourtysix_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_fourtyseven_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_get_by_config_name_test),
+               cmocka_unit_test(kds_s2000w_option_get_descriptor_over_max_options_test),
+               cmocka_unit_test(kds_s2000w_option_full_get_descriptor_by_number),
+               cmocka_unit_test(kds_s2000w_option_full_get_descriptor_over_max_options_test),
        };
 
-       return cmocka_run_group_tests(option_descriptor_tests, NULL, NULL);
+       return cmocka_run_group_tests(option_descriptor_tests, setup, teardown);
 }
\ No newline at end of file