Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1647664

[PATCH 1/7] selftests/ftrace: Skip full-glob-matching filter test on older kernel

Show all headers | View raw

Skip a part of ftrace filter test related to full-glob
matching if we are sure that the testing kernel is so old
that it does not support full-glob-matching yet.

Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
---
 .../ftrace/test.d/ftrace/func-filter-glob.tc       |   28 ++++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-glob.tc b/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-glob.tc
index 9dcd0ca..8095e12 100644
--- a/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-glob.tc
+++ b/tools/testing/selftests/ftrace/test.d/ftrace/func-filter-glob.tc
@@ -11,17 +11,6 @@ fi
 disable_tracing
 clear_trace
 
-# filter by ?, schedule is always good
-if ! echo "sch?dule" > set_ftrace_filter; then
-    # test for powerpc 64
-    if ! echo ".sch?dule" > set_ftrace_filter; then
-	fail "can not enable schedule filter"
-    fi
-    cat set_ftrace_filter | grep '^.schedule$'
-else
-    cat set_ftrace_filter | grep '^schedule$'
-fi
-
 ftrace_filter_check() { # glob grep
   echo "$1" > set_ftrace_filter
   cut -f1 -d" " set_ftrace_filter > $TMPDIR/actual
@@ -39,11 +28,28 @@ ftrace_filter_check '*schedule*' '^.*schedule.*$'
 # filter by *, end match
 ftrace_filter_check 'schedule*' '^schedule.*$'
 
+# Advanced full-glob matching feature is recently supported.
+# Skip the tests if we are sure the kernel does not support it.
+if grep -q 'accepts: .* glob-matching-pattern' README ; then
+
 # filter by *, both side match
 ftrace_filter_check 'sch*ule' '^sch.*ule$'
 
 # filter by char class.
 ftrace_filter_check '[Ss]y[Ss]_*' '^[Ss]y[Ss]_.*$'
 
+# filter by ?, schedule is always good
+if ! echo "sch?dule" > set_ftrace_filter; then
+    # test for powerpc 64
+    if ! echo ".sch?dule" > set_ftrace_filter; then
+	fail "can not enable schedule filter"
+    fi
+    cat set_ftrace_filter | grep '^.schedule$'
+else
+    cat set_ftrace_filter | grep '^schedule$'
+fi
+
+fi
+
 echo > set_ftrace_filter
 enable_tracing

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/7] selftests/ftrace: Some improvements of ftracetest Masami Hiramatsu <mhiramat@kernel.org> - 2017-05-23 08:10 +0200
  [PATCH 5/7] selftests/ftrace: Add instance indication in test log Masami Hiramatsu <mhiramat@kernel.org> - 2017-05-23 08:10 +0200
  [PATCH 3/7] ftrace/kprobes: selftests: Check kretprobe maxactive is supported Masami Hiramatsu <mhiramat@kernel.org> - 2017-05-23 08:10 +0200
  [PATCH 4/7] selftests/ftrace: Reset ftrace filter on older kernel Masami Hiramatsu <mhiramat@kernel.org> - 2017-05-23 08:10 +0200
  [PATCH 2/7] selftests/ftrace: Reduce trace buffer checking overhead Masami Hiramatsu <mhiramat@kernel.org> - 2017-05-23 08:10 +0200
  [PATCH 1/7] selftests/ftrace: Skip full-glob-matching filter test on older kernel Masami Hiramatsu <mhiramat@kernel.org> - 2017-05-23 08:10 +0200
  [PATCH 7/7] selftests/ftrace: Return unsupported if it detects older kernel Masami Hiramatsu <mhiramat@kernel.org> - 2017-05-23 08:20 +0200
  [PATCH 6/7] selftests/ftrace: Use top-level available_filter_function Masami Hiramatsu <mhiramat@kernel.org> - 2017-05-23 08:20 +0200

csiph-web