From 75c26f9ec8d69af88bbf1d07b2c7b38d08e8d67d Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Thu, 12 Nov 2015 19:43:56 +0000 Subject: cmocka_tests: Do not use deprecated cmocka interface The cmocka-1.0 introduced new interface for tests which is not compatible with the old one. And the old interface is deprecated which caused compiled warnings. Reviewed-By: Martin Basti --- .../ipa-slapi-plugins/ipa-cldap/ipa_cldap_tests.c | 6 ++-- .../ipa-extdom-extop/ipa_extdom_cmocka_tests.c | 32 ++++++++++++---------- 2 files changed, 21 insertions(+), 17 deletions(-) (limited to 'daemons/ipa-slapi-plugins') diff --git a/daemons/ipa-slapi-plugins/ipa-cldap/ipa_cldap_tests.c b/daemons/ipa-slapi-plugins/ipa-cldap/ipa_cldap_tests.c index 8f579cb0c..48b9636fa 100644 --- a/daemons/ipa-slapi-plugins/ipa-cldap/ipa_cldap_tests.c +++ b/daemons/ipa-slapi-plugins/ipa-cldap/ipa_cldap_tests.c @@ -59,10 +59,10 @@ void test_make_netbios_name(void **state) int main(int argc, const char *argv[]) { - const UnitTest tests[] = { - unit_test(test_make_netbios_name), + const struct CMUnitTest tests[] = { + cmocka_unit_test(test_make_netbios_name), }; - return run_tests(tests); + return cmocka_run_group_tests(tests, NULL, NULL); } diff --git a/daemons/ipa-slapi-plugins/ipa-extdom-extop/ipa_extdom_cmocka_tests.c b/daemons/ipa-slapi-plugins/ipa-extdom-extop/ipa_extdom_cmocka_tests.c index ec553fe62..526f903d2 100644 --- a/daemons/ipa-slapi-plugins/ipa-extdom-extop/ipa_extdom_cmocka_tests.c +++ b/daemons/ipa-slapi-plugins/ipa-extdom-extop/ipa_extdom_cmocka_tests.c @@ -258,7 +258,7 @@ struct test_data { struct ipa_extdom_ctx *ctx; }; -void extdom_req_setup(void **state) +static int extdom_req_setup(void **state) { struct test_data *test_data; @@ -272,9 +272,11 @@ void extdom_req_setup(void **state) assert_non_null(test_data->req); *state = test_data; + + return 0; } -void extdom_req_teardown(void **state) +static int extdom_req_teardown(void **state) { struct test_data *test_data; @@ -283,6 +285,8 @@ void extdom_req_teardown(void **state) free_req_data(test_data->req); free(test_data->ctx); free(test_data); + + return 0; } void test_set_err_msg(void **state) @@ -433,18 +437,18 @@ void test_decode(void **state) int main(int argc, const char *argv[]) { - const UnitTest tests[] = { - unit_test(test_getpwnam_r_wrapper), - unit_test(test_getpwuid_r_wrapper), - unit_test(test_getgrnam_r_wrapper), - unit_test(test_getgrgid_r_wrapper), - unit_test(test_get_user_grouplist), - unit_test_setup_teardown(test_set_err_msg, - extdom_req_setup, extdom_req_teardown), - unit_test_setup_teardown(test_encode, - extdom_req_setup, extdom_req_teardown), - unit_test(test_decode), + const struct CMUnitTest tests[] = { + cmocka_unit_test(test_getpwnam_r_wrapper), + cmocka_unit_test(test_getpwuid_r_wrapper), + cmocka_unit_test(test_getgrnam_r_wrapper), + cmocka_unit_test(test_getgrgid_r_wrapper), + cmocka_unit_test(test_get_user_grouplist), + cmocka_unit_test_setup_teardown(test_set_err_msg, + extdom_req_setup, extdom_req_teardown), + cmocka_unit_test_setup_teardown(test_encode, + extdom_req_setup, extdom_req_teardown), + cmocka_unit_test(test_decode), }; - return run_tests(tests); + return cmocka_run_group_tests(tests, NULL, NULL); } -- cgit