diff options
author | Jakub Hrozek <jhrozek@redhat.com> | 2015-03-09 21:48:11 +0100 |
---|---|---|
committer | Jakub Hrozek <jhrozek@redhat.com> | 2015-03-24 18:15:21 +0100 |
commit | 8d1ae1f350f5618f1d8f00211d6db6b025e52dd6 (patch) | |
tree | 7aa5411c9a4ff075f79a9a42b8eaf275f73f4875 /src/tests/cmocka/test_child_common.c | |
parent | cbab37e665d948278a491733e3993ac62beb0427 (diff) | |
download | sssd-8d1ae1f350f5618f1d8f00211d6db6b025e52dd6.tar.gz sssd-8d1ae1f350f5618f1d8f00211d6db6b025e52dd6.tar.xz sssd-8d1ae1f350f5618f1d8f00211d6db6b025e52dd6.zip |
tests: convert all unit tests to cmocka 1.0 or later
All tests now use the cmocka-1.0-compatible API.
Signed-off-by: Lukas Slebodnik <lslebodn@redhat.com>
Reviewed-by: Lukáš Slebodník <lslebodn@redhat.com>
Diffstat (limited to 'src/tests/cmocka/test_child_common.c')
-rw-r--r-- | src/tests/cmocka/test_child_common.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/tests/cmocka/test_child_common.c b/src/tests/cmocka/test_child_common.c index 23e14ce49..c8428cb76 100644 --- a/src/tests/cmocka/test_child_common.c +++ b/src/tests/cmocka/test_child_common.c @@ -38,7 +38,7 @@ struct child_test_ctx { struct sss_test_ctx *test_ctx; }; -void child_test_setup(void **state) +static int child_test_setup(void **state) { struct child_test_ctx *child_tctx; errno_t ret; @@ -63,15 +63,17 @@ void child_test_setup(void **state) child_tctx->pipefd_to_child[1]); *state = child_tctx; + return 0; } -void child_test_teardown(void **state) +static int child_test_teardown(void **state) { struct child_test_ctx *child_tctx = talloc_get_type(*state, struct child_test_ctx); talloc_free(child_tctx); check_leaks_pop(global_talloc_context); + return 0; } /* Just make sure the exec works. The child does nothing but exits */ @@ -165,13 +167,13 @@ int main(int argc, const char *argv[]) POPT_TABLEEND }; - const UnitTest tests[] = { - unit_test_setup_teardown(test_exec_child, - child_test_setup, - child_test_teardown), - unit_test_setup_teardown(test_exec_child_extra_args, - child_test_setup, - child_test_teardown), + const struct CMUnitTest tests[] = { + cmocka_unit_test_setup_teardown(test_exec_child, + child_test_setup, + child_test_teardown), + cmocka_unit_test_setup_teardown(test_exec_child_extra_args, + child_test_setup, + child_test_teardown), }; /* Set debug level to invalid value so we can deside if -d 0 was used. */ @@ -191,6 +193,6 @@ int main(int argc, const char *argv[]) DEBUG_CLI_INIT(debug_level); - rv = run_tests(tests); + rv = cmocka_run_group_tests(tests, NULL, NULL); return rv; } |