From 5aa939f2eb3f3ab04b65fde031a0c1f151928121 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 5 Feb 2021 14:10:03 +0100 Subject: [PATCH] test_echo_tcp_sendmsg_recvmsg_fd: split out test_tcp_sendmsg_recvmsg_fd_same() Signed-off-by: Stefan Metzmacher Reviewed-by: Andreas Schneider --- tests/test_echo_tcp_sendmsg_recvmsg_fd.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/tests/test_echo_tcp_sendmsg_recvmsg_fd.c b/tests/test_echo_tcp_sendmsg_recvmsg_fd.c index b0156c9..e1908ae 100644 --- a/tests/test_echo_tcp_sendmsg_recvmsg_fd.c +++ b/tests/test_echo_tcp_sendmsg_recvmsg_fd.c @@ -237,16 +237,16 @@ static void test_tcp_sendmsg_recvmsg_fd_array(const int *fds, size_t num_fds) } } -static void test_tcp_sendmsg_recvmsg_fd_1(void **state) +static void test_tcp_sendmsg_recvmsg_fd_same(size_t num_fds) { struct torture_address addr = { .sa_socklen = sizeof(struct sockaddr_in), }; int pass_sock_fd; + int fd_array[num_fds]; + size_t idx; int rc; - (void) state; /* unused */ - /* create socket file descriptor to be passed */ pass_sock_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); assert_int_not_equal(pass_sock_fd, -1); @@ -262,7 +262,19 @@ static void test_tcp_sendmsg_recvmsg_fd_1(void **state) rc = connect(pass_sock_fd, &addr.sa.s, addr.sa_socklen); assert_int_equal(rc, 0); - test_tcp_sendmsg_recvmsg_fd_array(&pass_sock_fd, 1); + for (idx = 0; idx < num_fds; idx++) { + fd_array[idx] = pass_sock_fd; + } + + test_tcp_sendmsg_recvmsg_fd_array(fd_array, num_fds); + + close(pass_sock_fd); +} + +static void test_tcp_sendmsg_recvmsg_fd_1(void **state) +{ + (void) state; /* unused */ + test_tcp_sendmsg_recvmsg_fd_same(1); } int main(void) { -- 2.34.1