tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

selftests/ftrace: Support ":README" suffix for requires

Add ":README" suffix support for the requires list, so that
the testcase can list up the required string for README file
to the requires list.

Note that the required string is treated as a fixed string,
instead of regular expression. Also, the testcase can specify
a string containing spaces with quotes. E.g.

# requires: "place: [<module>:]<symbol>":README

Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Reviewed-by: Tom Zanussi <zanussi@kernel.org>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>

authored by

Masami Hiramatsu and committed by
Shuah Khan 1b8eec51 305c8388

+25 -50
+2 -1
tools/testing/selftests/ftrace/ftracetest
··· 269 269 270 270 checkreq() { # testfile 271 271 requires=`grep "^#[ \t]*requires:" $1 | cut -f2- -d:` 272 - check_requires $requires 272 + # Use eval to pass quoted-patterns correctly. 273 + eval check_requires "$requires" 273 274 } 274 275 275 276 test_on_instance() { # testfile
+1 -4
tools/testing/selftests/ftrace/test.d/dynevent/add_remove_kprobe.tc
··· 1 1 #!/bin/sh 2 2 # SPDX-License-Identifier: GPL-2.0 3 3 # description: Generic dynamic event - add/remove kprobe events 4 - # requires: dynamic_events 5 - 6 - grep -q "place: \[<module>:\]<symbol>" README || exit_unsupported 7 - grep -q "place (kretprobe): \[<module>:\]<symbol>" README || exit_unsupported 4 + # requires: dynamic_events "place: [<module>:]<symbol>":README "place (kretprobe): [<module>:]<symbol>":README 8 5 9 6 echo 0 > events/enable 10 7 echo > dynamic_events
+1 -3
tools/testing/selftests/ftrace/test.d/dynevent/add_remove_synth.tc
··· 1 1 #!/bin/sh 2 2 # SPDX-License-Identifier: GPL-2.0 3 3 # description: Generic dynamic event - add/remove synthetic events 4 - # requires: dynamic_events 5 - 6 - grep -q "s:\[synthetic/\]" README || exit_unsupported 4 + # requires: dynamic_events "s:[synthetic/]":README 7 5 8 6 echo 0 > events/enable 9 7 echo > dynamic_events
+1 -6
tools/testing/selftests/ftrace/test.d/dynevent/clear_select_events.tc
··· 1 1 #!/bin/sh 2 2 # SPDX-License-Identifier: GPL-2.0 3 3 # description: Generic dynamic event - selective clear (compatibility) 4 - # requires: dynamic_events kprobe_events synthetic_events 5 - 6 - grep -q "place: \[<module>:\]<symbol>" README || exit_unsupported 7 - grep -q "place (kretprobe): \[<module>:\]<symbol>" README || exit_unsupported 8 - 9 - grep -q "s:\[synthetic/\]" README || exit_unsupported 4 + # requires: dynamic_events kprobe_events synthetic_events "place: [<module>:]<symbol>":README "place (kretprobe): [<module>:]<symbol>":README "s:[synthetic/]":README 10 5 11 6 echo 0 > events/enable 12 7 echo > dynamic_events
+1 -6
tools/testing/selftests/ftrace/test.d/dynevent/generic_clear_event.tc
··· 1 1 #!/bin/sh 2 2 # SPDX-License-Identifier: GPL-2.0 3 3 # description: Generic dynamic event - generic clear event 4 - # requires: dynamic_events 5 - 6 - grep -q "place: \[<module>:\]<symbol>" README || exit_unsupported 7 - grep -q "place (kretprobe): \[<module>:\]<symbol>" README || exit_unsupported 8 - 9 - grep -q "s:\[synthetic/\]" README || exit_unsupported 4 + # requires: dynamic_events "place: [<module>:]<symbol>":README "place (kretprobe): [<module>:]<symbol>":README "s:[synthetic/]":README 10 5 11 6 echo 0 > events/enable 12 7 echo > dynamic_events
+7 -1
tools/testing/selftests/ftrace/test.d/functions
··· 107 107 } 108 108 109 109 check_requires() { # Check required files and tracers 110 - for i in $* ; do 110 + for i in "$@" ; do 111 + r=${i%:README} 111 112 t=${i%:tracer} 112 113 if [ $t != $i ]; then 113 114 if ! grep -wq $t available_tracers ; then 114 115 echo "Required tracer $t is not configured." 116 + exit_unsupported 117 + fi 118 + elif [ $r != $i ]; then 119 + if ! grep -Fq "$r" README ; then 120 + echo "Required feature pattern \"$r\" is not in README." 115 121 exit_unsupported 116 122 fi 117 123 elif [ ! -e $i ]; then
+1 -3
tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_syntax.tc
··· 1 1 #!/bin/sh 2 2 # SPDX-License-Identifier: GPL-2.0 3 3 # description: Kprobe event argument syntax 4 - # requires: kprobe_events 5 - 6 - grep "x8/16/32/64" README > /dev/null || exit_unsupported # version issue 4 + # requires: kprobe_events "x8/16/32/64":README 7 5 8 6 PROBEFUNC="vfs_read" 9 7 GOODREG=
+1 -3
tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_type.tc
··· 1 1 #!/bin/sh 2 2 # SPDX-License-Identifier: GPL-2.0 3 3 # description: Kprobes event arguments with types 4 - # requires: kprobe_events 5 - 6 - grep "x8/16/32/64" README > /dev/null || exit_unsupported # version issue 4 + # requires: kprobe_events "x8/16/32/64":README 7 5 8 6 gen_event() { # Bitsize 9 7 echo "p:testprobe _do_fork \$stack0:s$1 \$stack0:u$1 \$stack0:x$1 \$stack0:b4@4/$1"
+1 -2
tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_user.tc
··· 1 1 #!/bin/sh 2 2 # SPDX-License-Identifier: GPL-2.0 3 3 # description: Kprobe event user-memory access 4 - # requires: kprobe_events 4 + # requires: kprobe_events '$arg<N>':README 5 5 6 - grep -q '\$arg<N>' README || exit_unsupported # depends on arch 7 6 grep -A10 "fetcharg:" README | grep -q 'ustring' || exit_unsupported 8 7 grep -A10 "fetcharg:" README | grep -q '\[u\]<offset>' || exit_unsupported 9 8
+1 -3
tools/testing/selftests/ftrace/test.d/kprobe/kprobe_multiprobe.tc
··· 1 1 #!/bin/sh 2 2 # SPDX-License-Identifier: GPL-2.0 3 3 # description: Create/delete multiprobe on kprobe event 4 - # requires: kprobe_events 5 - 6 - grep -q "Create/append/" README || exit_unsupported 4 + # requires: kprobe_events "Create/append/":README 7 5 8 6 # Choose 2 symbols for target 9 7 SYM1=_do_fork
+1 -3
tools/testing/selftests/ftrace/test.d/kprobe/kretprobe_maxactive.tc
··· 1 1 #!/bin/sh 2 2 # SPDX-License-Identifier: GPL-2.0 3 3 # description: Kretprobe dynamic event with maxactive 4 - # requires: kprobe_events 5 - 6 - grep -q 'r\[maxactive\]' README || exit_unsupported # this is older version 4 + # requires: kprobe_events 'r[maxactive]':README 7 5 8 6 # Test if we successfully reject unknown messages 9 7 if echo 'a:myprobeaccept inet_csk_accept' > kprobe_events; then false; else true; fi
+3 -1
tools/testing/selftests/ftrace/test.d/template
··· 1 1 #!/bin/sh 2 2 # SPDX-License-Identifier: GPL-2.0 3 3 # description: %HERE DESCRIBE WHAT THIS DOES% 4 - # requires: %HERE LIST THE REQUIRED FILES OR TRACERS% 4 + # requires: %HERE LIST THE REQUIRED FILES, TRACERS OR README-STRINGS% 5 5 # The required tracer needs :tracer suffix, e.g. function:tracer 6 + # The required README string needs :README suffix, e.g. "x8/16/32/64":README 7 + # and the README string is treated as a fixed-string instead of regexp pattern. 6 8 # you have to add ".tc" extention for your testcase file 7 9 # Note that all tests are run with "errexit" option. 8 10
+1 -3
tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-action-hist-xfail.tc
··· 1 1 #!/bin/sh 2 2 # SPDX-License-Identifier: GPL-2.0 3 3 # description: event trigger - test inter-event histogram trigger expected fail actions 4 - # requires: set_event snapshot 4 + # requires: set_event snapshot "snapshot()":README 5 5 6 6 fail() { #msg 7 7 echo $1 8 8 exit_fail 9 9 } 10 - 11 - grep -q "snapshot()" README || exit_unsupported # version issue 12 10 13 11 echo "Test expected snapshot action failure" 14 12
+1 -3
tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onchange-action-hist.tc
··· 1 1 #!/bin/sh 2 2 # SPDX-License-Identifier: GPL-2.0 3 3 # description: event trigger - test inter-event histogram trigger onchange action 4 - # requires: set_event 4 + # requires: set_event "onchange(var)":README 5 5 6 6 fail() { #msg 7 7 echo $1 8 8 exit_fail 9 9 } 10 - 11 - grep -q "onchange(var)" README || exit_unsupported # version issue 12 10 13 11 echo "Test onchange action" 14 12
+1 -5
tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-snapshot-action-hist.tc
··· 1 1 #!/bin/sh 2 2 # SPDX-License-Identifier: GPL-2.0 3 3 # description: event trigger - test inter-event histogram trigger snapshot action 4 - # requires: set_event snapshot events/sched/sched_process_fork/hist 4 + # requires: set_event snapshot events/sched/sched_process_fork/hist "onchange(var)":README "snapshot()":README 5 5 6 6 fail() { #msg 7 7 echo $1 8 8 exit_fail 9 9 } 10 - 11 - grep -q "onchange(var)" README || exit_unsupported # version issue 12 - 13 - grep -q "snapshot()" README || exit_unsupported # version issue 14 10 15 11 echo "Test snapshot action" 16 12
+1 -3
tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-trace-action-hist.tc
··· 1 1 #!/bin/sh 2 2 # SPDX-License-Identifier: GPL-2.0 3 3 # description: event trigger - test inter-event histogram trigger trace action 4 - # requires: set_event synthetic_events events/sched/sched_process_fork/hist 4 + # requires: set_event synthetic_events events/sched/sched_process_fork/hist "trace(<synthetic_event>":README 5 5 6 6 fail() { #msg 7 7 echo $1 8 8 exit_fail 9 9 } 10 - 11 - grep -q "trace(<synthetic_event>" README || exit_unsupported # version issue 12 10 13 11 echo "Test create synthetic event" 14 12