| Message ID | 20211201005030.GA3071525@paulmck-ThinkPad-P17-Gen-1 (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 8b4ff5f8bb126fa8ee6918f4854748277609cf68 |
| Headers | show |
| Series | testing/bpf: Update test names for xchg and cmpxchg | expand |
On Tue, Nov 30, 2021 at 4:50 PM Paul E. McKenney <paulmck@kernel.org> wrote: > > The test_cmpxchg() and test_xchg() functions say "test_run add". > Therefore, make them say "test_run cmpxchg" and "test_run xchg", > respectively. > > Cc: Shuah Khan <shuah@kernel.org> > Cc: Alexei Starovoitov <ast@kernel.org> > Cc: Daniel Borkmann <daniel@iogearbox.net> > Cc: Andrii Nakryiko <andrii@kernel.org> > Cc: Martin KaFai Lau <kafai@fb.com> > Cc: Song Liu <songliubraving@fb.com> > Cc: Yonghong Song <yhs@fb.com> > Cc: John Fastabend <john.fastabend@gmail.com> > Cc: KP Singh <kpsingh@kernel.org> > Cc: <linux-kselftest@vger.kernel.org> > Cc: <netdev@vger.kernel.org> > Cc: <bpf@vger.kernel.org> > Cc: <linux-kernel@vger.kernel.org> > Signed-off-by: Paul E. McKenney <paulmck@kernel.org> > fixed up "testing/bpf" to more commonly used "selftests/bpf" and pushed to bpf-next, thanks. > diff --git a/tools/testing/selftests/bpf/prog_tests/atomics.c b/tools/testing/selftests/bpf/prog_tests/atomics.c > index 0f9525293881b..86b7d5d84eec4 100644 > --- a/tools/testing/selftests/bpf/prog_tests/atomics.c > +++ b/tools/testing/selftests/bpf/prog_tests/atomics.c > @@ -167,7 +167,7 @@ static void test_cmpxchg(struct atomics_lskel *skel) > prog_fd = skel->progs.cmpxchg.prog_fd; > err = bpf_prog_test_run(prog_fd, 1, NULL, 0, > NULL, NULL, &retval, &duration); > - if (CHECK(err || retval, "test_run add", > + if (CHECK(err || retval, "test_run cmpxchg", > "err %d errno %d retval %d duration %d\n", err, errno, retval, duration)) > goto cleanup; > > @@ -196,7 +196,7 @@ static void test_xchg(struct atomics_lskel *skel) > prog_fd = skel->progs.xchg.prog_fd; > err = bpf_prog_test_run(prog_fd, 1, NULL, 0, > NULL, NULL, &retval, &duration); > - if (CHECK(err || retval, "test_run add", > + if (CHECK(err || retval, "test_run xchg", > "err %d errno %d retval %d duration %d\n", err, errno, retval, duration)) > goto cleanup; >
diff --git a/tools/testing/selftests/bpf/prog_tests/atomics.c b/tools/testing/selftests/bpf/prog_tests/atomics.c index 0f9525293881b..86b7d5d84eec4 100644 --- a/tools/testing/selftests/bpf/prog_tests/atomics.c +++ b/tools/testing/selftests/bpf/prog_tests/atomics.c @@ -167,7 +167,7 @@ static void test_cmpxchg(struct atomics_lskel *skel) prog_fd = skel->progs.cmpxchg.prog_fd; err = bpf_prog_test_run(prog_fd, 1, NULL, 0, NULL, NULL, &retval, &duration); - if (CHECK(err || retval, "test_run add", + if (CHECK(err || retval, "test_run cmpxchg", "err %d errno %d retval %d duration %d\n", err, errno, retval, duration)) goto cleanup; @@ -196,7 +196,7 @@ static void test_xchg(struct atomics_lskel *skel) prog_fd = skel->progs.xchg.prog_fd; err = bpf_prog_test_run(prog_fd, 1, NULL, 0, NULL, NULL, &retval, &duration); - if (CHECK(err || retval, "test_run add", + if (CHECK(err || retval, "test_run xchg", "err %d errno %d retval %d duration %d\n", err, errno, retval, duration)) goto cleanup;
The test_cmpxchg() and test_xchg() functions say "test_run add". Therefore, make them say "test_run cmpxchg" and "test_run xchg", respectively. Cc: Shuah Khan <shuah@kernel.org> Cc: Alexei Starovoitov <ast@kernel.org> Cc: Daniel Borkmann <daniel@iogearbox.net> Cc: Andrii Nakryiko <andrii@kernel.org> Cc: Martin KaFai Lau <kafai@fb.com> Cc: Song Liu <songliubraving@fb.com> Cc: Yonghong Song <yhs@fb.com> Cc: John Fastabend <john.fastabend@gmail.com> Cc: KP Singh <kpsingh@kernel.org> Cc: <linux-kselftest@vger.kernel.org> Cc: <netdev@vger.kernel.org> Cc: <bpf@vger.kernel.org> Cc: <linux-kernel@vger.kernel.org> Signed-off-by: Paul E. McKenney <paulmck@kernel.org>