selftests/bpf: Correct the check of join cgroup

JasonXing · Martin KaFai Lau · commit 003be25ab99c · 2025-02-06T21:18:04.000-08:00
Use ASSERT_OK_FD to check the return value of join cgroup, or else this test will pass even if the fd < 0. ASSERT_OK_FD can print the error message to the console. Suggested-by: Martin KaFai Lau <martin.lau@kernel.org> Signed-off-by: Jason Xing <kerneljasonxing@gmail.com> Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org> Acked-by: Hou Tao <houtao1@huawei.com> Link: https://lore.kernel.org/all/6d62bd77-6733-40c7-b240-a1aeff55566c@linux.dev/ Link: https://patch.msgid.link/20250204051154.57655-1-kerneljasonxing@gmail.com
diff --git a/tools/testing/selftests/bpf/prog_tests/setget_sockopt.c b/tools/testing/selftests/bpf/prog_tests/setget_sockopt.c
@@ -202,7 +202,7 @@ static void test_nonstandard_opt(int family)
 void test_setget_sockopt(void)
 {
 	cg_fd = test__join_cgroup(CG_NAME);
-	if (cg_fd < 0)
+	if (!ASSERT_OK_FD(cg_fd, "join cgroup"))
 		return;
 
 	if (create_netns())

Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ static void test_nonstandard_opt(int family)`
`202`	`202`	`void test_setget_sockopt(void)`
`203`	`203`	`{`
`204`	`204`	`cg_fd = test__join_cgroup(CG_NAME);`
`205`		`- if (cg_fd < 0)`
	`205`	`+ if (!ASSERT_OK_FD(cg_fd, "join cgroup"))`
`206`	`206`	`return;`
`207`	`207`
`208`	`208`	`if (create_netns())`