tests: Migrate to new cmocka API

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

12 files changed, 184 insertions, 100 deletions

diff --git a/tests/test_echo_tcp_bind.c b/tests/test_echo_tcp_bind.c
index b95724d..0baf0bd 100644
--- a/tests/test_echo_tcp_bind.c
+++ b/tests/test_echo_tcp_bind.c
@@ -19,19 +19,25 @@
 #include <rpc/rpc.h>
 #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;
 }
 
-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 teardown(void **state)
+static int teardown(void **state)
 {
 	torture_teardown_echo_srv(state);
+
+	return 0;
 }
 
 static void test_bind_ipv4(void **state)
@@ -492,39 +498,39 @@ static void test_bindresvport_on_ipv6_sock_null(void **state)
 int main(void) {
 	int rc;
 
-	const UnitTest tests[] = {
-		unit_test_setup_teardown(test_bind_ipv4,
+	const struct CMUnitTest tcp_bind_tests[] = {
+		cmocka_unit_test_setup_teardown(test_bind_ipv4,
 					 setup_echo_srv_tcp_ipv4,
 					 teardown),
 #if 0 /* TODO */
-		unit_test_setup_teardown(test_bind_ipv4_addr_in_use,
+		cmocka_unit_test_setup_teardown(test_bind_ipv4_addr_in_use,
 					 setup_echo_srv_tcp_ipv4,
 					 teardown),
 #endif
 #ifdef HAVE_BINDRESVPORT
-		unit_test_setup_teardown(test_bindresvport_ipv4,
+		cmocka_unit_test_setup_teardown(test_bindresvport_ipv4,
 					 setup_echo_srv_tcp_ipv4,
 					 teardown),
-		unit_test_setup_teardown(test_bindresvport_ipv4_null,
+		cmocka_unit_test_setup_teardown(test_bindresvport_ipv4_null,
 					 setup_echo_srv_tcp_ipv4,
 					 teardown),
 #endif /* HAVE_BINDRESVPORT */
 #ifdef HAVE_IPV6
-		unit_test_setup_teardown(test_bind_on_ipv6_sock,
+		cmocka_unit_test_setup_teardown(test_bind_on_ipv6_sock,
 					 setup_echo_srv_tcp_ipv6,
 					 teardown),
 #ifdef HAVE_BINDRESVPORT
-		unit_test_setup_teardown(test_bindresvport_on_ipv6_sock,
+		cmocka_unit_test_setup_teardown(test_bindresvport_on_ipv6_sock,
 					 setup_echo_srv_tcp_ipv6,
 					 teardown),
-		unit_test_setup_teardown(test_bindresvport_on_ipv6_sock_null,
+		cmocka_unit_test_setup_teardown(test_bindresvport_on_ipv6_sock_null,
 					 setup_echo_srv_tcp_ipv6,
 					 teardown),
 #endif /* HAVE_BINDRESVPORT */
 #endif /* HAVE_IPV6 */
 	};
 
-	rc = run_tests(tests);
+	rc = cmocka_run_group_tests(tcp_bind_tests, NULL, NULL);
 
 	return rc;
 }
diff --git a/tests/test_echo_tcp_connect.c b/tests/test_echo_tcp_connect.c
index 0697e13..f97b5ac 100644
--- a/tests/test_echo_tcp_connect.c
+++ b/tests/test_echo_tcp_connect.c
@@ -15,14 +15,18 @@
 #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;
 }
 
-static void teardown(void **state)
+static int teardown(void **state)
 {
 	torture_teardown_echo_srv(state);
+
+	return 0;
 }
 
 static void test_connect_broadcast_ipv4(void **state)
@@ -82,14 +86,16 @@ static void test_connect_downgrade_ipv6(void **state)
 int main(void) {
 	int rc;
 
-	const UnitTest tests[] = {
-		unit_test_setup_teardown(test_connect_broadcast_ipv4, setup_echo_srv_tcp_ipv4, teardown),
+	const struct CMUnitTest tcp_connect_tests[] = {
+		cmocka_unit_test(test_connect_broadcast_ipv4),
 #ifdef HAVE_IPV6
-		unit_test_setup_teardown(test_connect_downgrade_ipv6, setup_echo_srv_tcp_ipv4, teardown),
+		cmocka_unit_test(test_connect_downgrade_ipv6),
 #endif
 	};
 
-	rc = run_tests(tests);
+	rc = cmocka_run_group_tests(tcp_connect_tests,
+				    setup_echo_srv_tcp_ipv4,
+				    teardown);
 
 	return rc;
 }
diff --git a/tests/test_echo_tcp_get_peer_sock_name.c b/tests/test_echo_tcp_get_peer_sock_name.c
index 4be729c..9a00255 100644
--- a/tests/test_echo_tcp_get_peer_sock_name.c
+++ b/tests/test_echo_tcp_get_peer_sock_name.c
@@ -15,15 +15,19 @@
 #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);
 	setenv("SOCKET_WRAPPER_DEFAULT_IFACE", "20", 1);
+
+	return 0;
 }
 
-static void teardown(void **state)
+static int teardown(void **state)
 {
 	torture_teardown_echo_srv(state);
+
+	return 0;
 }
 
 static void _assert_sockaddr_equal(struct torture_address *addr, const char *a,
@@ -446,25 +450,27 @@ static void test_connect_getsockname_getpeername_len(void **state)
 int main(void) {
 	int rc;
 
-	const UnitTest tests[] = {
-		unit_test_setup_teardown(test_connect_getsockname_getpeername,
-					 setup_echo_srv_tcp_ipv4,
-					 teardown),
-		unit_test_setup_teardown(test_connect_getsockname_getpeername_port,
-					 setup_echo_srv_tcp_ipv4,
-					 teardown),
-		unit_test_setup_teardown(test_connect_getsockname_getpeername_any,
-					 setup_echo_srv_tcp_ipv4,
-					 teardown),
-		unit_test_setup_teardown(test_connect_getsockname_getpeername_any_port,
-					 setup_echo_srv_tcp_ipv4,
-					 teardown),
-		unit_test_setup_teardown(test_connect_getsockname_getpeername_len,
-					 setup_echo_srv_tcp_ipv4,
-					 teardown),
+	const struct CMUnitTest sock_name_tests[] = {
+		cmocka_unit_test_setup_teardown(test_connect_getsockname_getpeername,
+						setup_echo_srv_tcp_ipv4,
+						teardown),
+		cmocka_unit_test_setup_teardown(test_connect_getsockname_getpeername_port,
+						setup_echo_srv_tcp_ipv4,
+						teardown),
+		cmocka_unit_test_setup_teardown(test_connect_getsockname_getpeername_any,
+						setup_echo_srv_tcp_ipv4,
+						teardown),
+		cmocka_unit_test_setup_teardown(test_connect_getsockname_getpeername_any_port,
+						setup_echo_srv_tcp_ipv4,
+						teardown),
+		cmocka_unit_test_setup_teardown(test_connect_getsockname_getpeername_len,
+						setup_echo_srv_tcp_ipv4,
+						teardown),
 	};
 
-	rc = run_tests(tests);
+	rc = cmocka_run_group_tests(sock_name_tests,
+				    NULL,
+				    NULL);
 
 	return rc;
 }
diff --git a/tests/test_echo_tcp_socket.c b/tests/test_echo_tcp_socket.c
index a4b2f89..1bd4710 100644
--- a/tests/test_echo_tcp_socket.c
+++ b/tests/test_echo_tcp_socket.c
@@ -56,14 +56,14 @@ static void test_socket_getsockname6(void **state)
 int main(void) {
 	int rc;
 
-	const UnitTest tests[] = {
-		unit_test(test_socket_getsockname),
+	const struct CMUnitTest getsockname_tests[] = {
+		cmocka_unit_test(test_socket_getsockname),
 #ifdef HAVE_IPV6
-		unit_test(test_socket_getsockname6),
+		cmocka_unit_test(test_socket_getsockname6),
 #endif
 	};
 
-	rc = run_tests(tests);
+	rc = cmocka_run_group_tests(getsockname_tests, NULL, NULL);
 
 	return rc;
 }
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;
 }
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;
 }
diff --git a/tests/test_echo_tcp_writev_readv.c b/tests/test_echo_tcp_writev_readv.c
index 7a8b436..e011236 100644
--- a/tests/test_echo_tcp_writev_readv.c
+++ b/tests/test_echo_tcp_writev_readv.c
@@ -16,21 +16,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_writev_readv_ipv4(void **state)
@@ -166,14 +172,18 @@ static void test_writev_readv_ipv6(void **state)
 int main(void) {
 	int rc;
 
-	const UnitTest tests[] = {
-		unit_test_setup_teardown(test_writev_readv_ipv4, setup_echo_srv_tcp_ipv4, teardown),
+	const struct CMUnitTest tcp_writev_tests[] = {
+		cmocka_unit_test_setup_teardown(test_writev_readv_ipv4,
+						setup_echo_srv_tcp_ipv4,
+						teardown),
 #ifdef HAVE_IPV6
-		unit_test_setup_teardown(test_writev_readv_ipv6, setup_echo_srv_tcp_ipv6, teardown),
+		cmocka_unit_test_setup_teardown(test_writev_readv_ipv6,
+						setup_echo_srv_tcp_ipv6,
+						teardown),
 #endif
 	};
 
-	rc = run_tests(tests);
+	rc = cmocka_run_group_tests(tcp_writev_tests, NULL, NULL);
 
 	return rc;
 }
diff --git a/tests/test_echo_udp_send_recv.c b/tests/test_echo_udp_send_recv.c
index 435d1b9..cf4e848 100644
--- a/tests/test_echo_udp_send_recv.c
+++ b/tests/test_echo_udp_send_recv.c
@@ -15,21 +15,27 @@
 #include <stdio.h>
 #include <unistd.h>
 
-static void setup_echo_srv_udp_ipv4(void **state)
+static int setup_echo_srv_udp_ipv4(void **state)
 {
 	torture_setup_echo_srv_udp_ipv4(state);
+
+	return 0;
 }
 
 #ifdef HAVE_IPV6
-static void setup_echo_srv_udp_ipv6(void **state)
+static int setup_echo_srv_udp_ipv6(void **state)
 {
 	torture_setup_echo_srv_udp_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_send_recv_ipv4(void **state)
@@ -137,14 +143,18 @@ static void test_send_recv_ipv6(void **state)
 int main(void) {
 	int rc;
 
-	const UnitTest tests[] = {
-		unit_test_setup_teardown(test_send_recv_ipv4, setup_echo_srv_udp_ipv4, teardown),
+	const struct CMUnitTest send_tests[] = {
+		cmocka_unit_test_setup_teardown(test_send_recv_ipv4,
+						setup_echo_srv_udp_ipv4,
+						teardown),
 #ifdef HAVE_IPV6
-		unit_test_setup_teardown(test_send_recv_ipv6, setup_echo_srv_udp_ipv6, teardown),
+		cmocka_unit_test_setup_teardown(test_send_recv_ipv6,
+						setup_echo_srv_udp_ipv6,
+						teardown),
 #endif
 	};
 
-	rc = run_tests(tests);
+	rc = cmocka_run_group_tests(send_tests, NULL, NULL);
 
 	return rc;
 }
diff --git a/tests/test_echo_udp_sendmsg_recvmsg.c b/tests/test_echo_udp_sendmsg_recvmsg.c
index 111a9ae..aa9caea 100644
--- a/tests/test_echo_udp_sendmsg_recvmsg.c
+++ b/tests/test_echo_udp_sendmsg_recvmsg.c
@@ -15,21 +15,27 @@
 #include <stdio.h>
 #include <unistd.h>
 
-static void setup_echo_srv_udp_ipv4(void **state)
+static int setup_echo_srv_udp_ipv4(void **state)
 {
 	torture_setup_echo_srv_udp_ipv4(state);
+
+	return 0;
 }
 
 #ifdef HAVE_IPV6
-static void setup_echo_srv_udp_ipv6(void **state)
+static int setup_echo_srv_udp_ipv6(void **state)
 {
 	torture_setup_echo_srv_udp_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_sendto_recvfrom_ipv4(void **state)
@@ -188,14 +194,18 @@ static void test_sendto_recvfrom_ipv6(void **state)
 int main(void) {
 	int rc;
 
-	const UnitTest tests[] = {
-		unit_test_setup_teardown(test_sendto_recvfrom_ipv4, setup_echo_srv_udp_ipv4, teardown),
+	const struct CMUnitTest sendmsg_tests[] = {
+		cmocka_unit_test_setup_teardown(test_sendto_recvfrom_ipv4,
+						setup_echo_srv_udp_ipv4,
+						teardown),
 #ifdef HAVE_IPV6
-		unit_test_setup_teardown(test_sendto_recvfrom_ipv6, setup_echo_srv_udp_ipv6, teardown),
+		cmocka_unit_test_setup_teardown(test_sendto_recvfrom_ipv6,
+						setup_echo_srv_udp_ipv6,
+						teardown),
 #endif
 	};
 
-	rc = run_tests(tests);
+	rc = cmocka_run_group_tests(sendmsg_tests, NULL, NULL);
 
 	return rc;
 }
diff --git a/tests/test_echo_udp_sendto_recvfrom.c b/tests/test_echo_udp_sendto_recvfrom.c
index 88f8773..79948ce 100644
--- a/tests/test_echo_udp_sendto_recvfrom.c
+++ b/tests/test_echo_udp_sendto_recvfrom.c
@@ -15,21 +15,27 @@
 #include <stdio.h>
 #include <unistd.h>
 
-static void setup_echo_srv_udp_ipv4(void **state)
+static int setup_echo_srv_udp_ipv4(void **state)
 {
 	torture_setup_echo_srv_udp_ipv4(state);
+
+	return 0;
 }
 
 #ifdef HAVE_IPV6
-static void setup_echo_srv_udp_ipv6(void **state)
+static int setup_echo_srv_udp_ipv6(void **state)
 {
 	torture_setup_echo_srv_udp_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_sendto_recvfrom_ipv4(void **state)
@@ -189,14 +195,18 @@ static void test_sendto_recvfrom_ipv6(void **state)
 int main(void) {
 	int rc;
 
-	const UnitTest tests[] = {
-		unit_test_setup_teardown(test_sendto_recvfrom_ipv4, setup_echo_srv_udp_ipv4, teardown),
+	const struct CMUnitTest sendto_tests[] = {
+		cmocka_unit_test_setup_teardown(test_sendto_recvfrom_ipv4,
+						setup_echo_srv_udp_ipv4,
+						teardown),
 #ifdef HAVE_IPV6
-		unit_test_setup_teardown(test_sendto_recvfrom_ipv6, setup_echo_srv_udp_ipv6, teardown),
+		cmocka_unit_test_setup_teardown(test_sendto_recvfrom_ipv6,
+						setup_echo_srv_udp_ipv6,
+						teardown),
 #endif
 	};
 
-	rc = run_tests(tests);
+	rc = cmocka_run_group_tests(sendto_tests, NULL, NULL);
 
 	return rc;
 }
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;
 }
diff --git a/tests/test_sendmsg_recvmsg_fd.c b/tests/test_sendmsg_recvmsg_fd.c
index 78b4235..30c9861 100644
--- a/tests/test_sendmsg_recvmsg_fd.c
+++ b/tests/test_sendmsg_recvmsg_fd.c
@@ -106,11 +106,11 @@ static void test_sendmsg_recvmsg_fd(void **state)
 int main(void) {
 	int rc;
 
-	const UnitTest tests[] = {
-		unit_test(test_sendmsg_recvmsg_fd),
+	const struct CMUnitTest tests[] = {
+		cmocka_unit_test(test_sendmsg_recvmsg_fd),
 	};
 
-	rc = run_tests(tests);
+	rc = cmocka_run_group_tests(tests, NULL, NULL);
 
 	return rc;
 }