Skip to contentSkip to conversation

selftests/ftrace: Introduce exit_pass and exit_fail

PATCH In review Masami Hiramatsu 2 participants 3 messages Nov 3, 2017

Subsystems (2)
lore
Share & tools
lore

Masami Hiramatsu

author maintainer
#0 lore raw

PATCH v2 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.

---
Changes in v2:
- Restore "this must fail" comment (Thanks Steve!)

---
 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
index abc706cf7702..f9a9d424c980 100755
@@ -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
index aa51f6c17359..0696098d6408 100644
@@ -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
index 283b45ecb199..b6bc6bcfbd08 100644
@@ -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
index 96c1a95be4f7..fd6fe8aa1128 100644
@@ -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
index b8fe2e5b9e67..a9c2fce43b7e 100644
@@ -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
index 15e2d3fe1731..da77f57a1e61 100644
@@ -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
index 15c2dba06ea2..745f65b7e72e 100644
@@ -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
index 0ab2189613ef..7e598a36d33d 100644
@@ -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
index bab5ff7c607e..44163ad62c6b 100644
@@ -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
index 77dfb6b48186..e799f173b8ce 100644
@@ -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
index 7808336d6f50..63eba552b207 100644
@@ -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
index 113b4d9bc733..5e2c4697c3df 100644
@@ -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
index 7a9ab4ff83b6..51b0ffb78f8f 100644
@@ -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
index 8a353314dc9b..eceff951ab86 100644
@@ -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
index 1e1abe0ad354..402fcab43606 100644
@@ -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
index 74507db8bbc8..5a6cf02012c3 100644
@@ -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 # this must 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
index 64949d4eda69..58f57f107581 100644
@@ -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
index c75faefb4fff..f246293750ec 100644
@@ -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
index 0d09546258fd..4a0fb733feef 100644
@@ -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
index 5448f7abad5f..5c39ceb18a0d 100644
@@ -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
index c5435adfdd93..4f8cb73c22bb 100644
@@ -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
index 48849a8d577f..84c32e6bccb8 100644
@@ -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
index b7f86d10b549..d5bb9e18da22 100644
@@ -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
index fb66f7d9339d..3aa1cff92e8a 100644
@@ -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
index f9153087dd7c..9f0da5bd82fb 100644
@@ -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
index ed94f0c4e0e4..dd36ff1320e8 100644
@@ -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
index 9fa23b085def..e96bf981b09d 100644
@@ -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
index 87648e5f987c..aa89ea0b871a 100644
@@ -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
maintainer
#1 lore raw

tools/testing/selftests/ftrace/ftracetest SIG_RESULT= · line 231

Quoted 13 lines · On Sat, 4 Nov 2017 04:38:41 +0900 Masami Hiramatsu <[email protected]> wrote:
tools/testing/selftests/ftrace/ftracetest +6 -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

Sorry, I should have caught this before. But can you use $PASS and $FAIL in the functions? In case we want to override them in the future?

exit_pass() {
exit $PASS
}

exit_fail() {
exit $FAIL
}

-- Steve

author maintainer
#2 lore raw
Quoted 9 lines · On Fri, 3 Nov 2017 16:11:09 -0400 Steven Rostedt <[email protected]> wrote:
Quoted 6 lines · On Sat, 4 Nov 2017 04:38:41 +0900 Masami Hiramatsu <[email protected]> wrote:
tools/testing/selftests/ftrace/ftracetest +0 -0
@@ -222,7 +222,14 @@ SIG_RESULT=
 SIG_BASE=36	# Use realtime signals
 SIG_PID=$$
 
Quoted 10 lines

tools/testing/selftests/ftrace/ftracetest SIG_RESULT= · line 231

Quoted 7 lines
tools/testing/selftests/ftrace/ftracetest +6 -0
+exit_pass () {
+  exit 0
+}
+
 SIG_FAIL=$((SIG_BASE + FAIL))
+exit_fail () {
+  exit 1

Sorry, I should have caught this before. But can you use $PASS and $FAIL in the functions? In case we want to override them in the future?

No, as I've said, those are ftracetest internal vars :(

And also you can not override it because each testcase script can exit with error code of executed command in failure case. IOW, the error code propagates caller's exit code. So we can not controll it. This means you can just expect the exit code 0 or !0.

Thank you,

Quoted 10 lines

exit_pass() {
exit $PASS
}

exit_fail() {
exit $FAIL
}

-- Steve

Signature · 1 line
Masami Hiramatsu <[email protected]>