[PATCH mptcp-next v2 3/4] Squash to "selftests/bpf: Add bpf scheduler test"

Geliang Tang posted 4 patches 8 months, 1 week ago
[PATCH mptcp-next v2 3/4] Squash to "selftests/bpf: Add bpf scheduler test"
Posted by Geliang Tang 8 months, 1 week ago
From: Geliang Tang <tanggeliang@kylinos.cn>

Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
 tools/testing/selftests/bpf/prog_tests/mptcp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c
index 987692863fde..2476f0a083bc 100644
--- a/tools/testing/selftests/bpf/prog_tests/mptcp.c
+++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c
@@ -507,11 +507,11 @@ static void send_data_and_verify(char *sched, bool addr1, bool addr2)
 	unsigned int delta_ms;
 
 	server_fd = start_mptcp_server(AF_INET, ADDR_1, PORT_1, 0);
-	if (CHECK(server_fd < 0, sched, "start_mptcp_server: %d\n", errno))
+	if (!ASSERT_OK_FD(server_fd, "start_mptcp_server"))
 		return;
 
 	client_fd = connect_to_fd(server_fd, 0);
-	if (CHECK(client_fd < 0, sched, "connect_to_fd: %d\n", errno))
+	if (!ASSERT_OK_FD(client_fd, "connect_to_fd"))
 		goto fail;
 
 	if (clock_gettime(CLOCK_MONOTONIC, &start) < 0)
-- 
2.43.0
Re: [PATCH mptcp-next v2 3/4] Squash to "selftests/bpf: Add bpf scheduler test"
Posted by Geliang Tang 8 months, 1 week ago
On Mon, 2024-09-09 at 09:55 +0800, Geliang Tang wrote:
> From: Geliang Tang <tanggeliang@kylinos.cn>

Should use dedicated ASSERT_OK_FD() to check the fds.

> 
> Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
> ---
>  tools/testing/selftests/bpf/prog_tests/mptcp.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c
> b/tools/testing/selftests/bpf/prog_tests/mptcp.c
> index 987692863fde..2476f0a083bc 100644
> --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c
> +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c
> @@ -507,11 +507,11 @@ static void send_data_and_verify(char *sched,
> bool addr1, bool addr2)
>  	unsigned int delta_ms;
>  
>  	server_fd = start_mptcp_server(AF_INET, ADDR_1, PORT_1, 0);
> -	if (CHECK(server_fd < 0, sched, "start_mptcp_server: %d\n",
> errno))
> +	if (!ASSERT_OK_FD(server_fd, "start_mptcp_server"))
>  		return;
>  
>  	client_fd = connect_to_fd(server_fd, 0);
> -	if (CHECK(client_fd < 0, sched, "connect_to_fd: %d\n",
> errno))
> +	if (!ASSERT_OK_FD(client_fd, "connect_to_fd"))
>  		goto fail;
>  
>  	if (clock_gettime(CLOCK_MONOTONIC, &start) < 0)