linux-kselftest.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Masami Hiramatsu <mhiramat@kernel.org>
To: Shuah Khan <shuah@kernel.org>, Steven Rostedt <rostedt@goodmis.org>
Cc: linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [BUGFIX PATCH v4 1/4] selftests/ftrace: Fix to check the existence of set_ftrace_filter
Date: Tue, 26 Nov 2019 17:34:16 +0900	[thread overview]
Message-ID: <157475725551.3389.16908546371847626653.stgit@devnote2> (raw)
In-Reply-To: <157475724667.3389.15752644047898709246.stgit@devnote2>

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>
---
 Changes in v4:
 - Clear set_ftrace_notrace
---
 tools/testing/selftests/ftrace/test.d/functions |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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


  reply	other threads:[~2019-11-26  8:34 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-26  8:34 [BUGFIX PATCH v4 0/4] selftests/ftrace: Fix ftracetest testcases for non-function tracer case Masami Hiramatsu
2019-11-26  8:34 ` Masami Hiramatsu [this message]
2019-11-26 17:24   ` [BUGFIX PATCH v4 1/4] selftests/ftrace: Fix to check the existence of set_ftrace_filter Steven Rostedt
2019-11-26  8:34 ` [BUGFIX PATCH v4 2/4] selftests/ftrace: Fix ftrace test cases to check unsupported Masami Hiramatsu
2019-11-26 17:49   ` Steven Rostedt
2019-11-26 23:31     ` Masami Hiramatsu
2019-11-26 23:42       ` [BUGFIX PATCH v4.1 " Masami Hiramatsu
2019-11-26 23:50       ` [BUGFIX PATCH v4 " shuah
2019-11-27  2:15         ` Steven Rostedt
2019-11-26  8:34 ` [BUGFIX PATCH v4 3/4] selftests/ftrace: Do not to use absolute debugfs path Masami Hiramatsu
2019-11-26  8:34 ` [BUGFIX PATCH v4 4/4] selftests/ftrace: Fix multiple kprobe testcase Masami Hiramatsu
2019-11-26 17:37 ` [BUGFIX PATCH v4 0/4] selftests/ftrace: Fix ftracetest testcases for non-function tracer case shuah

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=157475725551.3389.16908546371847626653.stgit@devnote2 \
    --to=mhiramat@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=rostedt@goodmis.org \
    --cc=shuah@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).