From: Wang Yufen <wangyufen@huawei.com>
To: <ast@kernel.org>, <daniel@iogearbox.net>, <andrii@kernel.org>,
<martin.lau@linux.dev>, <song@kernel.org>, <yhs@fb.com>,
<john.fastabend@gmail.com>, <kpsingh@kernel.org>,
<sdf@google.com>, <haoluo@google.com>, <jolsa@kernel.org>,
<mykolal@fb.com>, <shuah@kernel.org>, <delyank@fb.com>,
<zhudi2@huawei.com>, <jakub@cloudflare.com>, <kuba@kernel.org>,
<kuifeng@fb.com>, <deso@posteo.net>, <zhuyifei@google.com>,
<hengqi.chen@gmail.com>
Cc: <bpf@vger.kernel.org>
Subject: [bpf-next 03/11] bpf/selftests: convert sockopt test to ASSERT_* macros
Date: Mon, 26 Sep 2022 13:12:03 +0800 [thread overview]
Message-ID: <1664169131-32405-4-git-send-email-wangyufen@huawei.com> (raw)
In-Reply-To: <1664169131-32405-1-git-send-email-wangyufen@huawei.com>
Convert the selftest to use the preferred ASSERT_* macros instead of the
deprecated CHECK().
Signed-off-by: Wang Yufen <wangyufen@huawei.com>
---
tools/testing/selftests/bpf/prog_tests/sockopt.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/bpf/prog_tests/sockopt.c b/tools/testing/selftests/bpf/prog_tests/sockopt.c
index cd09f4c..aa4debf6 100644
--- a/tools/testing/selftests/bpf/prog_tests/sockopt.c
+++ b/tools/testing/selftests/bpf/prog_tests/sockopt.c
@@ -972,12 +972,12 @@ void test_sockopt(void)
int cgroup_fd, i;
cgroup_fd = test__join_cgroup("/sockopt");
- if (CHECK_FAIL(cgroup_fd < 0))
+ if (!ASSERT_GE(cgroup_fd, 0, "join_cgroup"))
return;
for (i = 0; i < ARRAY_SIZE(tests); i++) {
test__start_subtest(tests[i].descr);
- CHECK_FAIL(run_test(cgroup_fd, &tests[i]));
+ ASSERT_OK(run_test(cgroup_fd, &tests[i]), tests[i].descr);
}
close(cgroup_fd);
--
1.8.3.1
next prev parent reply other threads:[~2022-09-26 4:51 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-26 5:12 [bpf-next 00/11] bpf/selftests: convert some tests to ASSERT_* macros Wang Yufen
2022-09-26 5:12 ` [bpf-next 01/11] bpf/selftests: convert sockmap_basic test " Wang Yufen
2022-09-26 5:12 ` [bpf-next 02/11] bpf/selftests: convert sockmap_ktls " Wang Yufen
2022-09-26 5:12 ` Wang Yufen [this message]
2022-09-26 5:12 ` [bpf-next 04/11] bpf/selftests: convert sockopt_inherit " Wang Yufen
2022-09-26 5:12 ` [bpf-next 05/11] bpf/selftests: convert sockopt_multi " Wang Yufen
2022-09-26 5:12 ` [bpf-next 06/11] bpf/selftests: convert sockopt_sk " Wang Yufen
2022-09-26 5:12 ` [bpf-next 07/11] bpf/selftests: convert tcp_estats " Wang Yufen
2022-09-26 5:12 ` [bpf-next 08/11] bpf/selftests: convert tcp_hdr_options " Wang Yufen
2022-11-04 1:29 ` Martin KaFai Lau
2022-09-26 5:12 ` [bpf-next 09/11] bpf/selftests: convert tcp_rtt " Wang Yufen
2022-09-26 5:12 ` [bpf-next 10/11] bpf/selftests: convert tcpbpf_user " Wang Yufen
2022-09-26 5:12 ` [bpf-next 11/11] bpf/selftests: convert udp_limit " Wang Yufen
2022-09-29 0:37 ` [bpf-next 00/11] bpf/selftests: convert some tests " Andrii Nakryiko
2022-09-29 3:37 ` wangyufen
2022-09-29 0:40 ` patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1664169131-32405-4-git-send-email-wangyufen@huawei.com \
--to=wangyufen@huawei.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=delyank@fb.com \
--cc=deso@posteo.net \
--cc=haoluo@google.com \
--cc=hengqi.chen@gmail.com \
--cc=jakub@cloudflare.com \
--cc=john.fastabend@gmail.com \
--cc=jolsa@kernel.org \
--cc=kpsingh@kernel.org \
--cc=kuba@kernel.org \
--cc=kuifeng@fb.com \
--cc=martin.lau@linux.dev \
--cc=mykolal@fb.com \
--cc=sdf@google.com \
--cc=shuah@kernel.org \
--cc=song@kernel.org \
--cc=yhs@fb.com \
--cc=zhudi2@huawei.com \
--cc=zhuyifei@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox