[PATCH mptcp-next] Squash to "selftests/bpf: add MPTCP test base"

Geliang Tang posted 1 patch 1 year, 10 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/multipath-tcp/mptcp_net-next tags/patchew/6f5f38cec460bdd53b7d0f179816a1248c3db0ee.1652487491.git.geliang.tang@suse.com
Maintainers: KP Singh <kpsingh@kernel.org>, Mat Martineau <mathew.j.martineau@linux.intel.com>, Daniel Borkmann <daniel@iogearbox.net>, Shuah Khan <shuah@kernel.org>, Andrii Nakryiko <andrii@kernel.org>, Yonghong Song <yhs@fb.com>, Martin KaFai Lau <kafai@fb.com>, John Fastabend <john.fastabend@gmail.com>, Matthieu Baerts <matthieu.baerts@tessares.net>, Alexei Starovoitov <ast@kernel.org>, Song Liu <songliubraving@fb.com>
There is a newer version of this series
tools/testing/selftests/bpf/prog_tests/mptcp.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
[PATCH mptcp-next] Squash to "selftests/bpf: add MPTCP test base"
Posted by Geliang Tang 1 year, 10 months ago
This code using ASSERT_* instead of CHECK_FAIL should be
squashed into patch #3, it shouldn't be in patch #4.

Squash to "[mptcp-next,v2,03/14] selftests/bpf: add MPTCP
test base" in "update bpf patches on export branch" series.

Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
 tools/testing/selftests/bpf/prog_tests/mptcp.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing/selftests/bpf/prog_tests/mptcp.c
index cb0389ca8690..301f19375811 100644
--- a/tools/testing/selftests/bpf/prog_tests/mptcp.c
+++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c
@@ -103,25 +103,25 @@ void test_base(void)
 	int server_fd, cgroup_fd;
 
 	cgroup_fd = test__join_cgroup("/mptcp");
-	if (CHECK_FAIL(cgroup_fd < 0))
+	if (!ASSERT_GE(cgroup_fd, 0, "test__join_cgroup"))
 		return;
 
 	/* without MPTCP */
 	server_fd = start_server(AF_INET, SOCK_STREAM, NULL, 0, 0);
-	if (CHECK_FAIL(server_fd < 0))
+	if (!ASSERT_GE(server_fd, 0, "start_server"))
 		goto with_mptcp;
 
-	CHECK_FAIL(run_test(cgroup_fd, server_fd, false));
+	ASSERT_OK(run_test(cgroup_fd, server_fd, false), "run_test tcp");
 
 	close(server_fd);
 
 with_mptcp:
 	/* with MPTCP */
 	server_fd = start_mptcp_server(AF_INET, NULL, 0, 0);
-	if (CHECK_FAIL(server_fd < 0))
+	if (!ASSERT_GE(server_fd, 0, "start_mptcp_server"))
 		goto close_cgroup_fd;
 
-	CHECK_FAIL(run_test(cgroup_fd, server_fd, true));
+	ASSERT_OK(run_test(cgroup_fd, server_fd, true), "run_test mptcp");
 
 	close(server_fd);
 
-- 
2.34.1


Re: [PATCH mptcp-next] Squash to "selftests/bpf: add MPTCP test base"
Posted by Matthieu Baerts 1 year, 10 months ago
Hi Geliang,

On 14/05/2022 02:19, Geliang Tang wrote:
> This code using ASSERT_* instead of CHECK_FAIL should be
> squashed into patch #3, it shouldn't be in patch #4.
> 
> Squash to "[mptcp-next,v2,03/14] selftests/bpf: add MPTCP
> test base" in "update bpf patches on export branch" series.

Good catch, thank you!

- 6e72fba9dc4f: "squashed" in "selftests/bpf: add MPTCP test base"
- Results: c9545a538777..71f8702ac0b2 (export)

Cheers,
Matt
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net