Re: [PATCH mptcp-next] Squash to "selftests/bpf: Add mptcp subflow subtest"

[Geliang Tang <geliang@kernel.org>]

Superseded. Move into "cleanups for bpf schedulers" set v2.

Thanks,
-Geliang

On Sat, 2024-09-07 at 11:45 +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 | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c
> b/tools/testing/selftests/bpf/prog_tests/mptcp.c
> index 93869c873cad..987692863fde 100644
> --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c
> +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c
> @@ -394,11 +394,11 @@ static void run_subflow(void)
>  	socklen_t len;
>  
>  	server_fd = start_mptcp_server(AF_INET, ADDR_1, PORT_1, 0);
> -	if (!ASSERT_GE(server_fd, 0, "start_mptcp_server"))
> +	if (!ASSERT_OK_FD(server_fd, "start_mptcp_server"))
>  		return;
>  
>  	client_fd = connect_to_fd(server_fd, 0);
> -	if (!ASSERT_GE(client_fd, 0, "connect to fd"))
> +	if (!ASSERT_OK_FD(client_fd, "connect_to_fd"))
>  		goto close_server;
>  
>  	send_byte(client_fd);
> @@ -429,7 +429,7 @@ static void test_subflow(void)
>  	struct bpf_link *link;
>  
>  	cgroup_fd = test__join_cgroup("/mptcp_subflow");
> -	if (!ASSERT_GE(cgroup_fd, 0, "join_cgroup: mptcp_subflow"))
> +	if (!ASSERT_OK_FD(cgroup_fd, "join_cgroup: mptcp_subflow"))
>  		return;
>  
>  	skel = mptcp_subflow__open_and_load();