2023-06-10 14:41:19

by Mark Brown

Subject: [PATCH] selftests/ftace: Fix KTAP output ordering

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 <[email protected]>
---
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 <[email protected]>

2023-06-12 05:41:00

by Masami Hiramatsu

Subject: Re: [PATCH] selftests/ftace: Fix KTAP output ordering

On Sat, 10 Jun 2023 15:27:55 +0100
Mark Brown <[email protected]> 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) <[email protected]>

Shuah, could you pick this?

Thank you,

>
> Fixes: dbcf76390eb9 ("elftests/ftrace: Improve integration with kselftest runner")
> Signed-off-by: Mark Brown <[email protected]>
> ---
> 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 <[email protected]>
>


--
Masami Hiramatsu (Google) <[email protected]>

2023-06-12 14:42:26

by Steven Rostedt

Subject: Re: [PATCH] selftests/ftace: Fix KTAP output ordering

> Acked-by: Masami Hiramatsu (Google) <[email protected]>
>
> Shuah, could you pick this?

Acked-by: Steven Rostedt (Google) <[email protected]>

-- Steve

2023-06-12 23:28:20

by Shuah Khan

Subject: Re: [PATCH] selftests/ftace: Fix KTAP output ordering

On 6/12/23 08:10, Steven Rostedt wrote:
>
>> Acked-by: Masami Hiramatsu (Google) <[email protected]>
>>
>> Shuah, could you pick this?
>
> Acked-by: Steven Rostedt (Google) <[email protected]>
>
> -- Steve

Applied to linux-kselftest next for Linux 6.5-rc1.

thanks,
-- Shuah