aboutsummaryrefslogtreecommitdiff
path: root/tests/test_echo_tcp_write_read.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_write_read.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_write_read.c')
-rw-r--r--tests/test_echo_tcp_write_read.c24
1 files changed, 17 insertions, 7 deletions
diff --git a/tests/test_echo_tcp_write_read.c b/tests/test_echo_tcp_write_read.c
index 80200ad..9129022 100644
--- a/tests/test_echo_tcp_write_read.c
+++ b/tests/test_echo_tcp_write_read.c
@@ -15,21 +15,27 @@
#include <stdio.h>
#include <unistd.h>
-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;
}
#endif
-static void teardown(void **state)
+static int teardown(void **state)
{
torture_teardown_echo_srv(state);
+
+ return 0;
}
static void test_write_read_ipv4(void **state)
@@ -133,14 +139,18 @@ static void test_write_read_ipv6(void **state)
int main(void) {
int rc;
- const UnitTest tests[] = {
- unit_test_setup_teardown(test_write_read_ipv4, setup_echo_srv_tcp_ipv4, teardown),
+ const struct CMUnitTest tcp_write_tests[] = {
+ cmocka_unit_test_setup_teardown(test_write_read_ipv4,
+ setup_echo_srv_tcp_ipv4,
+ teardown),
#ifdef HAVE_IPV6
- unit_test_setup_teardown(test_write_read_ipv6, setup_echo_srv_tcp_ipv6, teardown),
+ cmocka_unit_test_setup_teardown(test_write_read_ipv6,
+ setup_echo_srv_tcp_ipv6,
+ teardown),
#endif
};
- rc = run_tests(tests);
+ rc = cmocka_run_group_tests(tcp_write_tests, NULL, NULL);
return rc;
}