diff options
| author |   Masami Hiramatsu <mhiramat@kernel.org> | 2019-11-26 17:34:16 +0900 |
|---|---|---|
| committer |   Shuah Khan <skhan@linuxfoundation.org> | 2019-12-09 10:53:04 -0700 |
| commit | fd1baf6ca2ea3550ea47f2bb0bdcf34ec764a779 (patch) | |
| tree | 7b9bcaa90ad33c33403cd6947405984d66df82ea /tools/testing/selftests/ftrace | |
| parent | Linux 5.5-rc1 (diff) | |
| download | linux-dev-fd1baf6ca2ea3550ea47f2bb0bdcf34ec764a779.tar.xz linux-dev-fd1baf6ca2ea3550ea47f2bb0bdcf34ec764a779.zip | |
selftests/ftrace: Fix to check the existence of set_ftrace_filter
If we run ftracetest on the kernel with CONFIG_DYNAMIC_FTRACE=n,
there is no set_ftrace_filter and all test cases are failed, because
reset_ftrace_filter() returns an error.
Let's check whether set_ftrace_filter exists in reset_ftrace_filter()
and clean up only set_ftrace_notrace in initialize_ftrace().
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
Diffstat (limited to 'tools/testing/selftests/ftrace')
| -rw-r--r-- | tools/testing/selftests/ftrace/test.d/functions | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/testing/selftests/ftrace/test.d/functions b/tools/testing/selftests/ftrace/test.d/functions index 86986c4bba54..5d4550591ff9 100644 --- a/tools/testing/selftests/ftrace/test.d/functions +++ b/tools/testing/selftests/ftrace/test.d/functions @@ -46,6 +46,9 @@ reset_events_filter() { # reset all current setting filters } reset_ftrace_filter() { # reset all triggers in set_ftrace_filter + if [ ! -f set_ftrace_filter ]; then + return 0 + fi echo > set_ftrace_filter grep -v '^#' set_ftrace_filter | while read t; do tr=`echo $t | cut -d: -f2` @@ -93,7 +96,7 @@ initialize_ftrace() { # Reset ftrace to initial-state disable_events [ -f set_event_pid ] && echo > set_event_pid [ -f set_ftrace_pid ] && echo > set_ftrace_pid - [ -f set_ftrace_filter ] && echo | tee set_ftrace_* + [ -f set_ftrace_notrace ] && echo > set_ftrace_notrace [ -f set_graph_function ] && echo | tee set_graph_* [ -f stack_trace_filter ] && echo > stack_trace_filter [ -f kprobe_events ] && echo > kprobe_events |