| Message ID | 20230609-ftrace-ktap-order-v1-1-0abf4d0d6922@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 8cd0d8633e2de4e6dd9ddae7980432e726220fdb |
| Headers | show |
| Series | selftests/ftace: Fix KTAP output ordering | expand |
On Sat, 10 Jun 2023 15:27:55 +0100 Mark Brown <broonie@kernel.org> wrote: > The KTAP parser I used to test the KTAP output for ftracetest was overly > robust and did not notice that the test number and pass/fail result were > reversed. Fix this. Oops, I also missed that part. According to the Documentation/dev-tools/ktap.rst, the result string ('ok', 'not ok') must be the first item. Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org> Shuah, could you pick this? Thank you, > > Fixes: dbcf76390eb9 ("elftests/ftrace: Improve integration with kselftest runner") > Signed-off-by: Mark Brown <broonie@kernel.org> > --- > tools/testing/selftests/ftrace/ftracetest | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/testing/selftests/ftrace/ftracetest b/tools/testing/selftests/ftrace/ftracetest > index 2506621e75df..cb5f18c06593 100755 > --- a/tools/testing/selftests/ftrace/ftracetest > +++ b/tools/testing/selftests/ftrace/ftracetest > @@ -301,7 +301,7 @@ ktaptest() { # result comment > comment="# $comment" > fi > > - echo $CASENO $result $INSTANCE$CASENAME $comment > + echo $result $CASENO $INSTANCE$CASENAME $comment > } > > eval_result() { # sigval > > --- > base-commit: dbcf76390eb9a65d5d0c37b0cd57335218564e37 > change-id: 20230609-ftrace-ktap-order-d5b64a74dc79 > > Best regards, > -- > Mark Brown <broonie@kernel.org> >
> Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org> > > Shuah, could you pick this? Acked-by: Steven Rostedt (Google) <rostedt@goodmis.org> -- Steve
On 6/12/23 08:10, Steven Rostedt wrote: > >> Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org> >> >> Shuah, could you pick this? > > Acked-by: Steven Rostedt (Google) <rostedt@goodmis.org> > > -- Steve Applied to linux-kselftest next for Linux 6.5-rc1. thanks, -- Shuah
diff --git a/tools/testing/selftests/ftrace/ftracetest b/tools/testing/selftests/ftrace/ftracetest index 2506621e75df..cb5f18c06593 100755 --- a/tools/testing/selftests/ftrace/ftracetest +++ b/tools/testing/selftests/ftrace/ftracetest @@ -301,7 +301,7 @@ ktaptest() { # result comment comment="# $comment" fi - echo $CASENO $result $INSTANCE$CASENAME $comment + echo $result $CASENO $INSTANCE$CASENAME $comment } eval_result() { # sigval
The KTAP parser I used to test the KTAP output for ftracetest was overly robust and did not notice that the test number and pass/fail result were reversed. Fix this. Fixes: dbcf76390eb9 ("elftests/ftrace: Improve integration with kselftest runner") Signed-off-by: Mark Brown <broonie@kernel.org> --- tools/testing/selftests/ftrace/ftracetest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- base-commit: dbcf76390eb9a65d5d0c37b0cd57335218564e37 change-id: 20230609-ftrace-ktap-order-d5b64a74dc79 Best regards,