aboutsummaryrefslogtreecommitdiff
path: root/tests/test_echo_tcp_socket_options.c
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2015-08-06 16:08:32 +0200
committerAndreas Schneider <asn@samba.org>2015-08-11 13:58:22 +0200
commit055eb78f3690008021e17da8714da9db5247308c (patch)
tree55719919f9cdd60110be1ec3bb3a75918fd87f94 /tests/test_echo_tcp_socket_options.c
parent00eb31542d26c4f4cfb245a58795fcaf5653c953 (diff)
downloadsocket_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_echo_tcp_socket_options.c')
-rw-r--r--tests/test_echo_tcp_socket_options.c40
1 files changed, 26 insertions, 14 deletions
diff --git a/tests/test_echo_tcp_socket_options.c b/tests/test_echo_tcp_socket_options.c
index dbad41d..f068fb8 100644
--- a/tests/test_echo_tcp_socket_options.c
+++ b/tests/test_echo_tcp_socket_options.c
@@ -20,26 +20,34 @@
#define ZERO_STRUCT(x) memset((char *)&(x), 0, sizeof(x))
#endif
-static void setup_echo_srv_tcp_ipv4(void **state)
+static int setup_echo_srv_tcp_ipv4(void **state)
{
torture_setup_echo_srv_tcp_ipv4(state);
+
+ return 0;
}
#ifdef HAVE_IPV6
-static void setup_echo_srv_tcp_ipv6(void **state)
+static int setup_echo_srv_tcp_ipv6(void **state)
{
torture_setup_echo_srv_tcp_ipv6(state);
+
+ return 0;
}
-static void setup_ipv6(void **state)
+static int setup_ipv6(void **state)
{
torture_setup_socket_dir(state);
+
+ return 0;
}
#endif
-static void teardown(void **state)
+static int teardown(void **state)
{
torture_teardown_echo_srv(state);
+
+ return 0;
}
static void test_sockopt_sndbuf(void **state)
@@ -288,20 +296,24 @@ static void test_bind_ipv6_only(void **state)
int main(void) {
int rc;
- const UnitTest tests[] = {
- unit_test_setup_teardown(test_sockopt_sndbuf, setup_echo_srv_tcp_ipv4, teardown),
- unit_test_setup_teardown(test_sockopt_so,
- setup_echo_srv_tcp_ipv4,
- teardown),
+ const struct CMUnitTest sockopt_tests[] = {
+ cmocka_unit_test_setup_teardown(test_sockopt_sndbuf,
+ setup_echo_srv_tcp_ipv4,
+ teardown),
+ cmocka_unit_test_setup_teardown(test_sockopt_so,
+ setup_echo_srv_tcp_ipv4,
+ teardown),
#ifdef HAVE_IPV6
- unit_test_setup_teardown(test_sockopt_so6,
- setup_echo_srv_tcp_ipv6,
- teardown),
- unit_test_setup_teardown(test_bind_ipv6_only, setup_ipv6, teardown),
+ cmocka_unit_test_setup_teardown(test_sockopt_so6,
+ setup_echo_srv_tcp_ipv6,
+ teardown),
+ cmocka_unit_test_setup_teardown(test_bind_ipv6_only,
+ setup_ipv6,
+ teardown),
#endif
};
- rc = run_tests(tests);
+ rc = cmocka_run_group_tests(sockopt_tests, NULL, NULL);
return rc;
}