diff options
| author | Andreas Schneider <asn@samba.org> | 2015-08-06 16:08:32 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@samba.org> | 2015-08-11 13:58:22 +0200 |
| commit | 055eb78f3690008021e17da8714da9db5247308c (patch) | |
| tree | 55719919f9cdd60110be1ec3bb3a75918fd87f94 /tests/test_ioctl.c | |
| parent | 00eb31542d26c4f4cfb245a58795fcaf5653c953 (diff) | |
| download | socket_wrapper-055eb78f3690008021e17da8714da9db5247308c.tar.gz socket_wrapper-055eb78f3690008021e17da8714da9db5247308c.tar.xz socket_wrapper-055eb78f3690008021e17da8714da9db5247308c.zip | |
tests: Migrate to new cmocka API
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'tests/test_ioctl.c')
| -rw-r--r-- | tests/test_ioctl.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/tests/test_ioctl.c b/tests/test_ioctl.c index 47ef838..aebff91 100644 --- a/tests/test_ioctl.c +++ b/tests/test_ioctl.c @@ -14,7 +14,7 @@ #include <limits.h> #include <unistd.h> -static void setup(void **state) +static int setup(void **state) { char test_tmpdir[256]; const char *p; @@ -29,16 +29,18 @@ static void setup(void **state) *state = strdup(p); setenv("SOCKET_WRAPPER_DIR", p, 1); setenv("SOCKET_WRAPPER_DEFAULT_IFACE", "11", 1); + + return 0; } -static void teardown(void **state) +static int teardown(void **state) { char remove_cmd[PATH_MAX] = {0}; char *s = (char *)*state; int rc; if (s == NULL) { - return; + return -1; } snprintf(remove_cmd, sizeof(remove_cmd), "rm -rf %s", s); @@ -48,6 +50,8 @@ static void teardown(void **state) if (rc < 0) { fprintf(stderr, "%s failed: %s", remove_cmd, strerror(errno)); } + + return rc; } static void test_swrap_socket(void **state) @@ -95,12 +99,12 @@ static void test_swrap_ioctl_sock(void **state) int main(void) { int rc; - const UnitTest tests[] = { - unit_test_setup_teardown(test_swrap_socket, setup, teardown), - unit_test_setup_teardown(test_swrap_ioctl_sock, setup, teardown), + const struct CMUnitTest ioctl_tests[] = { + cmocka_unit_test_setup_teardown(test_swrap_socket, setup, teardown), + cmocka_unit_test_setup_teardown(test_swrap_ioctl_sock, setup, teardown), }; - rc = run_tests(tests); + rc = cmocka_run_group_tests(ioctl_tests, NULL, NULL); return rc; } |