| Message ID | 159040205682.10129.10826221002090446642.stgit@devnote2 (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 619ee76f5c9f6a1d601d1a056a454d62bf676ae4 |
| Headers | show |
| Series | selftests/ftrace: Return unsupported if no error_log file | expand |
On 5/25/20 4:20 AM, Masami Hiramatsu wrote: > Check whether error_log file exists in tracing/error_log testcase > and return UNSUPPORTED if no error_log file. > > This can happen if we run the ftracetest on the older stable > kernel. > > Fixes: 4eab1cc461a6 ("selftests/ftrace: Add tracing/error_log testcase") > Cc: stable@vger.kernel.org > Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org> > --- > .../ftrace/test.d/ftrace/tracing-error-log.tc | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/tools/testing/selftests/ftrace/test.d/ftrace/tracing-error-log.tc b/tools/testing/selftests/ftrace/test.d/ftrace/tracing-error-log.tc > index 021c03fd885d..23465823532b 100644 > --- a/tools/testing/selftests/ftrace/test.d/ftrace/tracing-error-log.tc > +++ b/tools/testing/selftests/ftrace/test.d/ftrace/tracing-error-log.tc > @@ -14,6 +14,8 @@ if [ ! -f set_event ]; then > exit_unsupported > fi > > +[ -f error_log ] || exit_unsupported > + > ftrace_errlog_check 'event filter parse error' '((sig >= 10 && sig < 15) || dsig ^== 17) && comm != bash' 'events/signal/signal_generate/filter' > > exit 0 > Applied to git.kernel.org/pub/scm/linux/kernel/git/shuah/linux kselftest.git/ next branch for Linux 5.8-rc1 thanks, -- Shuah
diff --git a/tools/testing/selftests/ftrace/test.d/ftrace/tracing-error-log.tc b/tools/testing/selftests/ftrace/test.d/ftrace/tracing-error-log.tc index 021c03fd885d..23465823532b 100644 --- a/tools/testing/selftests/ftrace/test.d/ftrace/tracing-error-log.tc +++ b/tools/testing/selftests/ftrace/test.d/ftrace/tracing-error-log.tc @@ -14,6 +14,8 @@ if [ ! -f set_event ]; then exit_unsupported fi +[ -f error_log ] || exit_unsupported + ftrace_errlog_check 'event filter parse error' '((sig >= 10 && sig < 15) || dsig ^== 17) && comm != bash' 'events/signal/signal_generate/filter' exit 0
Check whether error_log file exists in tracing/error_log testcase and return UNSUPPORTED if no error_log file. This can happen if we run the ftracetest on the older stable kernel. Fixes: 4eab1cc461a6 ("selftests/ftrace: Add tracing/error_log testcase") Cc: stable@vger.kernel.org Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org> --- .../ftrace/test.d/ftrace/tracing-error-log.tc | 2 ++ 1 file changed, 2 insertions(+)