selftests/ftrace: Introduce exit_pass and exit_fail
Masami Hiramatsu
maintainerPATCH 1/1 selftests/ftrace: Introduce exit_pass and exit_fail
As same as other results, introduce exit_pass and exit_fail functions so that we can easily understand what will happen.
--- tools/testing/selftests/ftrace/ftracetest | 7 +++++++ .../selftests/ftrace/test.d/00basic/basic4.tc | 2 +- .../selftests/ftrace/test.d/event/event-enable.tc | 2 +- .../selftests/ftrace/test.d/event/event-pid.tc | 2 +- .../ftrace/test.d/event/subsystem-enable.tc | 2 +- .../ftrace/test.d/event/toplevel-enable.tc | 2 +- .../ftrace/test.d/ftrace/fgraph-filter-stack.tc | 2 +- .../ftrace/test.d/ftrace/fgraph-filter.tc | 2 +- .../ftrace/test.d/ftrace/func-filter-pid.tc | 2 +- .../ftrace/test.d/ftrace/func_event_triggers.tc | 5 ++--- .../ftrace/test.d/ftrace/func_profiler.tc | 2 +- .../ftrace/test.d/ftrace/func_set_ftrace_file.tc | 2 +- .../test.d/ftrace/func_traceonoff_triggers.tc | 2 +- .../ftrace/test.d/instances/instance-event.tc | 2 +- .../selftests/ftrace/test.d/instances/instance.tc | 2 +- .../selftests/ftrace/test.d/kprobe/busy_check.tc | 2 +- .../selftests/ftrace/test.d/kprobe/kprobe_args.tc | 2 +- .../ftrace/test.d/kprobe/kprobe_args_type.tc | 2 +- .../ftrace/test.d/kprobe/kretprobe_args.tc | 2 +- tools/testing/selftests/ftrace/test.d/template | 1 + .../ftrace/test.d/trigger/trigger-eventonoff.tc | 2 +- .../ftrace/test.d/trigger/trigger-filter.tc | 2 +- .../ftrace/test.d/trigger/trigger-hist-mod.tc | 2 +- .../ftrace/test.d/trigger/trigger-hist.tc | 2 +- .../ftrace/test.d/trigger/trigger-multihist.tc | 2 +- .../ftrace/test.d/trigger/trigger-snapshot.tc | 2 +- .../ftrace/test.d/trigger/trigger-stacktrace.tc | 2 +- .../ftrace/test.d/trigger/trigger-traceonoff.tc | 2 +- 28 files changed, 35 insertions(+), 28 deletions(-)
tools/testing/selftests/ftrace/ftracetest +7 -0
@@ -222,7 +222,14 @@ SIG_RESULT= SIG_BASE=36 # Use realtime signals SIG_PID=$$ +exit_pass () { + exit 0 +} + SIG_FAIL=$((SIG_BASE + FAIL)) +exit_fail () { + exit 1 +} trap 'SIG_RESULT=$FAIL' $SIG_FAIL SIG_UNRESOLVED=$((SIG_BASE + UNRESOLVED))
tools/testing/selftests/ftrace/test.d/00basic/basic4.tc +1 -1
@@ -2,4 +2,4 @@ # description: Basic event tracing check test -f available_events -a -f set_event -a -d events # check scheduler events are available -grep -q sched available_events && exit 0 || exit $FAIL +grep -q sched available_events && exit_pass || exit_fail
tools/testing/selftests/ftrace/test.d/event/event-enable.tc +1 -1
@@ -10,7 +10,7 @@ do_reset() { fail() { #msg do_reset echo $1 - exit $FAIL + exit_fail } yield() {
tools/testing/selftests/ftrace/test.d/event/event-pid.tc +1 -1
@@ -12,7 +12,7 @@ do_reset() { fail() { #msg do_reset echo $1 - exit $FAIL + exit_fail } yield() {
tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc +1 -1
@@ -10,7 +10,7 @@ do_reset() { fail() { #msg do_reset echo $1 - exit $FAIL + exit_fail } yield() {
tools/testing/selftests/ftrace/test.d/event/toplevel-enable.tc +1 -1
@@ -9,7 +9,7 @@ do_reset() { fail() { #msg do_reset echo $1 - exit $FAIL + exit_fail } yield() {
tools/testing/selftests/ftrace/test.d/ftrace/fgraph-filter-stack.tc +1 -1
@@ -27,7 +27,7 @@ do_reset() { fail() { # msg do_reset echo $1 - exit $FAIL + exit_fail } disable_tracing
tools/testing/selftests/ftrace/test.d/ftrace/fgraph-filter.tc +1 -1
@@ -17,7 +17,7 @@ do_reset() { fail() { # msg do_reset echo $1 - exit $FAIL + exit_fail } disable_tracing
tools/testing/selftests/ftrace/test.d/ftrace/func-filter-pid.tc +1 -1
@@ -50,7 +50,7 @@ do_reset() { fail() { # msg do_reset echo $1 - exit $FAIL + exit_fail } yield() {
tools/testing/selftests/ftrace/test.d/ftrace/func_event_triggers.tc +2 -3
@@ -26,7 +26,7 @@ do_reset() { fail() { # mesg do_reset echo $1 - exit $FAIL + exit_fail } SLEEP_TIME=".1"
@@ -47,8 +47,7 @@ test_event_enabled() { e=`cat $EVENT_ENABLE` if [ "$e" != $val ]; then - echo "Expected $val but found $e" - exit 1 + fail "Expected $val but found $e" fi }
tools/testing/selftests/ftrace/test.d/ftrace/func_profiler.tc +1 -1
@@ -31,7 +31,7 @@ fail() { # mesg reset_tracer echo > set_ftrace_filter echo $1 - exit $FAIL + exit_fail } echo "Testing function tracer with profiler:"
tools/testing/selftests/ftrace/test.d/ftrace/func_set_ftrace_file.tc +1 -1
@@ -25,7 +25,7 @@ do_reset() { fail() { # mesg do_reset echo $1 - exit $FAIL + exit_fail } do_reset
tools/testing/selftests/ftrace/test.d/ftrace/func_traceonoff_triggers.tc +1 -1
@@ -26,7 +26,7 @@ do_reset() { fail() { # mesg do_reset echo $1 - exit $FAIL + exit_fail } SLEEP_TIME=".1"
tools/testing/selftests/ftrace/test.d/instances/instance-event.tc +1 -1
@@ -10,7 +10,7 @@ fail() { # mesg rmdir foo 2>/dev/null echo $1 set -e - exit $FAIL + exit_fail } cd instances
tools/testing/selftests/ftrace/test.d/instances/instance.tc +1 -1
@@ -10,7 +10,7 @@ fail() { # mesg rmdir x y z 2>/dev/null echo $1 set -e - exit $FAIL + exit_fail } cd instances
tools/testing/selftests/ftrace/test.d/kprobe/busy_check.tc +1 -1
@@ -8,7 +8,7 @@ echo > kprobe_events echo p:myevent _do_fork > kprobe_events test -d events/kprobes/myevent echo 1 > events/kprobes/myevent/enable -echo > kprobe_events && exit 1 # this must fail +echo > kprobe_events && exit_fail echo 0 > events/kprobes/myevent/enable echo > kprobe_events # this must succeed clear_trace
tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args.tc +1 -1
@@ -13,5 +13,5 @@ echo 1 > events/kprobes/testprobe/enable echo 0 > events/kprobes/testprobe/enable echo "-:testprobe" >> kprobe_events clear_trace -test -d events/kprobes/testprobe && exit 1 || exit 0 +test -d events/kprobes/testprobe && exit_fail || exit_pass
tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_type.tc +1 -1
@@ -34,4 +34,4 @@ check_types $ARGS echo "-:testprobe" >> kprobe_events clear_trace -test -d events/kprobes/testprobe && exit 1 || exit 0 +test -d events/kprobes/testprobe && exit_fail || exit_pass
tools/testing/selftests/ftrace/test.d/kprobe/kretprobe_args.tc +1 -1
@@ -13,4 +13,4 @@ echo 1 > events/kprobes/testprobe2/enable echo 0 > events/kprobes/testprobe2/enable echo '-:testprobe2' >> kprobe_events clear_trace -test -d events/kprobes/testprobe2 && exit 1 || exit 0 +test -d events/kprobes/testprobe2 && exit_fail || exit_pass
tools/testing/selftests/ftrace/test.d/template +1 -0
@@ -4,6 +4,7 @@ # Note that all tests are run with "errexit" option. exit 0 # Return 0 if the test is passed, otherwise return !0 +# Or you can call exit_pass for passed test, and exit_fail for failed test. # If the test could not run because of lack of feature, call exit_unsupported # If the test returned unclear results, call exit_unresolved # If the test is a dummy, or a placeholder, call exit_untested
tools/testing/selftests/ftrace/test.d/trigger/trigger-eventonoff.tc +1 -1
@@ -11,7 +11,7 @@ do_reset() { fail() { #msg do_reset echo $1 - exit $FAIL + exit_fail } if [ ! -f set_event -o ! -d events/sched ]; then
tools/testing/selftests/ftrace/test.d/trigger/trigger-filter.tc +1 -1
@@ -11,7 +11,7 @@ do_reset() { fail() { #msg do_reset echo $1 - exit $FAIL + exit_fail } if [ ! -f set_event -o ! -d events/sched ]; then
tools/testing/selftests/ftrace/test.d/trigger/trigger-hist-mod.tc +1 -1
@@ -11,7 +11,7 @@ do_reset() { fail() { #msg do_reset echo $1 - exit $FAIL + exit_fail } if [ ! -f set_event -o ! -d events/sched ]; then
tools/testing/selftests/ftrace/test.d/trigger/trigger-hist.tc +1 -1
@@ -11,7 +11,7 @@ do_reset() { fail() { #msg do_reset echo $1 - exit $FAIL + exit_fail } if [ ! -f set_event -o ! -d events/sched ]; then
tools/testing/selftests/ftrace/test.d/trigger/trigger-multihist.tc +1 -1
@@ -11,7 +11,7 @@ do_reset() { fail() { #msg do_reset echo $1 - exit $FAIL + exit_fail } if [ ! -f set_event -o ! -d events/sched ]; then
tools/testing/selftests/ftrace/test.d/trigger/trigger-snapshot.tc +1 -1
@@ -10,7 +10,7 @@ do_reset() { fail() { #msg do_reset echo $1 - exit $FAIL + exit_fail } if [ ! -f set_event -o ! -d events/sched ]; then
tools/testing/selftests/ftrace/test.d/trigger/trigger-stacktrace.tc +1 -1
@@ -10,7 +10,7 @@ do_reset() { fail() { #msg do_reset echo $1 - exit $FAIL + exit_fail } if [ ! -f set_event -o ! -d events/sched ]; then
tools/testing/selftests/ftrace/test.d/trigger/trigger-traceonoff.tc +1 -1
@@ -10,7 +10,7 @@ do_reset() { fail() { #msg do_reset echo $1 - exit $FAIL + exit_fail } if [ ! -f set_event -o ! -d events/sched ]; then
Steven Rostedt
maintainertools/testing/selftests/ftrace/test.d/kprobe/busy_check.tc echo > kprobe_events · line 11
Quoted 10 lines · On Tue, 31 Oct 2017 23:51:42 +0900 Masami Hiramatsu <[email protected]> wrote:
tools/testing/selftests/ftrace/test.d/kprobe/busy_check.tc +1
-1@@ -8,7 +8,7 @@ echo > kprobe_events echo p:myevent _do_fork > kprobe_events test -d events/kprobes/myevent echo 1 > events/kprobes/myevent/enable -echo > kprobe_events && exit 1 # this must fail +echo > kprobe_events && exit_fail
Should we keep the comment about "this must fail", otherwise it may look like a mistake. Echoing in kprobe_events returns failure here?
-- Steve
Quoted 3 lines
tools/testing/selftests/ftrace/test.d/kprobe/busy_check.tc +0
-0echo 0 > events/kprobes/myevent/enable echo > kprobe_events # this must succeed clear_trace
Masami Hiramatsu
maintainerQuoted 16 lines · On Tue, 31 Oct 2017 17:44:32 -0400 Steven Rostedt <[email protected]> wrote:
tools/testing/selftests/ftrace/test.d/kprobe/busy_check.tc echo > kprobe_events · line 11
Quoted 10 lines · On Tue, 31 Oct 2017 23:51:42 +0900 Masami Hiramatsu <[email protected]> wrote:
tools/testing/selftests/ftrace/test.d/kprobe/busy_check.tc +1
-1@@ -8,7 +8,7 @@ echo > kprobe_events echo p:myevent _do_fork > kprobe_events test -d events/kprobes/myevent echo 1 > events/kprobes/myevent/enable -echo > kprobe_events && exit 1 # this must fail +echo > kprobe_events && exit_failShould we keep the comment about "this must fail", otherwise it may look like a mistake. Echoing in
kprobe_eventsreturns failure here?
Ah, good catch! I misread the comment is for "exit 1"...
Thank you,
Quoted 7 lines
-- Steve
Quoted 3 lines
tools/testing/selftests/ftrace/test.d/kprobe/busy_check.tc +0
-0echo 0 > events/kprobes/myevent/enable echo > kprobe_events # this must succeed clear_trace
Signature · 1 line
Masami Hiramatsu <[email protected]>
Shuah Khan
maintainerQuoted 20 lines · Masami Hiramatsu
Quoted 16 lines · On Tue, 31 Oct 2017 17:44:32 -0400 Steven Rostedt <[email protected]> wrote:
tools/testing/selftests/ftrace/test.d/kprobe/busy_check.tc echo > kprobe_events · line 11
Quoted 10 lines · On Tue, 31 Oct 2017 23:51:42 +0900 Masami Hiramatsu <[email protected]> wrote:
tools/testing/selftests/ftrace/test.d/kprobe/busy_check.tc +1
-1@@ -8,7 +8,7 @@ echo > kprobe_events echo p:myevent _do_fork > kprobe_events test -d events/kprobes/myevent echo 1 > events/kprobes/myevent/enable -echo > kprobe_events && exit 1 # this must fail +echo > kprobe_events && exit_failShould we keep the comment about "this must fail", otherwise it may look like a mistake. Echoing in
kprobe_eventsreturns failure here?
Quoted 13 lines
Ah, good catch! I misread the comment is for "exit 1"...
Thank you,
Quoted 7 lines
-- Steve
Quoted 3 lines
tools/testing/selftests/ftrace/test.d/kprobe/busy_check.tc +0
-0echo 0 > events/kprobes/myevent/enable echo > kprobe_events # this must succeed clear_trace
Hi Masami,
Thanks Steve for the catch. I will wait for v2 then.
thanks,
-- Shuah
Masami Hiramatsu
maintainerQuoted 35 lines · On Wed, 1 Nov 2017 15:18:41 -0600 Shuah Khan <[email protected]> wrote:
Quoted 20 lines · Masami Hiramatsu
Quoted 16 lines · On Tue, 31 Oct 2017 17:44:32 -0400 Steven Rostedt <[email protected]> wrote:
tools/testing/selftests/ftrace/test.d/kprobe/busy_check.tc echo > kprobe_events · line 11
Quoted 10 lines · On Tue, 31 Oct 2017 23:51:42 +0900 Masami Hiramatsu <[email protected]> wrote:
tools/testing/selftests/ftrace/test.d/kprobe/busy_check.tc +1
-1@@ -8,7 +8,7 @@ echo > kprobe_events echo p:myevent _do_fork > kprobe_events test -d events/kprobes/myevent echo 1 > events/kprobes/myevent/enable -echo > kprobe_events && exit 1 # this must fail +echo > kprobe_events && exit_failShould we keep the comment about "this must fail", otherwise it may look like a mistake. Echoing in
kprobe_eventsreturns failure here?Quoted 13 lines
Ah, good catch! I misread the comment is for "exit 1"...
Thank you,
Quoted 7 lines
-- Steve
Quoted 3 lines
tools/testing/selftests/ftrace/test.d/kprobe/busy_check.tc +0
-0echo 0 > events/kprobes/myevent/enable echo > kprobe_events # this must succeed clear_trace
Quoted 3 lines
Hi Masami,
Thanks Steve for the catch. I will wait for v2 then.
Sorry for later, I'll send it soon.
Thank you,
Quoted 4 lines
thanks,
-- Shuah
Signature · 1 line
Masami Hiramatsu <[email protected]>