Browse Source

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.

Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
Masami Hiramatsu 7 years ago
parent
commit
42534b1f58
28 changed files with 35 additions and 28 deletions
  1. 7 0
      tools/testing/selftests/ftrace/ftracetest
  2. 1 1
      tools/testing/selftests/ftrace/test.d/00basic/basic4.tc
  3. 1 1
      tools/testing/selftests/ftrace/test.d/event/event-enable.tc
  4. 1 1
      tools/testing/selftests/ftrace/test.d/event/event-pid.tc
  5. 1 1
      tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc
  6. 1 1
      tools/testing/selftests/ftrace/test.d/event/toplevel-enable.tc
  7. 1 1
      tools/testing/selftests/ftrace/test.d/ftrace/fgraph-filter-stack.tc
  8. 1 1
      tools/testing/selftests/ftrace/test.d/ftrace/fgraph-filter.tc
  9. 1 1
      tools/testing/selftests/ftrace/test.d/ftrace/func-filter-pid.tc
  10. 2 3
      tools/testing/selftests/ftrace/test.d/ftrace/func_event_triggers.tc
  11. 1 1
      tools/testing/selftests/ftrace/test.d/ftrace/func_profiler.tc
  12. 1 1
      tools/testing/selftests/ftrace/test.d/ftrace/func_set_ftrace_file.tc
  13. 1 1
      tools/testing/selftests/ftrace/test.d/ftrace/func_traceonoff_triggers.tc
  14. 1 1
      tools/testing/selftests/ftrace/test.d/instances/instance-event.tc
  15. 1 1
      tools/testing/selftests/ftrace/test.d/instances/instance.tc
  16. 1 1
      tools/testing/selftests/ftrace/test.d/kprobe/busy_check.tc
  17. 1 1
      tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args.tc
  18. 1 1
      tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_type.tc
  19. 1 1
      tools/testing/selftests/ftrace/test.d/kprobe/kretprobe_args.tc
  20. 1 0
      tools/testing/selftests/ftrace/test.d/template
  21. 1 1
      tools/testing/selftests/ftrace/test.d/trigger/trigger-eventonoff.tc
  22. 1 1
      tools/testing/selftests/ftrace/test.d/trigger/trigger-filter.tc
  23. 1 1
      tools/testing/selftests/ftrace/test.d/trigger/trigger-hist-mod.tc
  24. 1 1
      tools/testing/selftests/ftrace/test.d/trigger/trigger-hist.tc
  25. 1 1
      tools/testing/selftests/ftrace/test.d/trigger/trigger-multihist.tc
  26. 1 1
      tools/testing/selftests/ftrace/test.d/trigger/trigger-snapshot.tc
  27. 1 1
      tools/testing/selftests/ftrace/test.d/trigger/trigger-stacktrace.tc
  28. 1 1
      tools/testing/selftests/ftrace/test.d/trigger/trigger-traceonoff.tc

+ 7 - 0
tools/testing/selftests/ftrace/ftracetest

@@ -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))

+ 1 - 1
tools/testing/selftests/ftrace/test.d/00basic/basic4.tc

@@ -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

+ 1 - 1
tools/testing/selftests/ftrace/test.d/event/event-enable.tc

@@ -11,7 +11,7 @@ do_reset() {
 fail() { #msg
     do_reset
     echo $1
-    exit $FAIL
+    exit_fail
 }
 
 yield() {

+ 1 - 1
tools/testing/selftests/ftrace/test.d/event/event-pid.tc

@@ -13,7 +13,7 @@ do_reset() {
 fail() { #msg
     do_reset
     echo $1
-    exit $FAIL
+    exit_fail
 }
 
 yield() {

+ 1 - 1
tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc

@@ -11,7 +11,7 @@ do_reset() {
 fail() { #msg
     do_reset
     echo $1
-    exit $FAIL
+    exit_fail
 }
 
 yield() {

+ 1 - 1
tools/testing/selftests/ftrace/test.d/event/toplevel-enable.tc

@@ -10,7 +10,7 @@ do_reset() {
 fail() { #msg
     do_reset
     echo $1
-    exit $FAIL
+    exit_fail
 }
 
 yield() {

+ 1 - 1
tools/testing/selftests/ftrace/test.d/ftrace/fgraph-filter-stack.tc

@@ -28,7 +28,7 @@ do_reset() {
 fail() { # msg
     do_reset
     echo $1
-    exit $FAIL
+    exit_fail
 }
 
 disable_tracing

+ 1 - 1
tools/testing/selftests/ftrace/test.d/ftrace/fgraph-filter.tc

@@ -18,7 +18,7 @@ do_reset() {
 fail() { # msg
     do_reset
     echo $1
-    exit $FAIL
+    exit_fail
 }
 
 disable_tracing

+ 1 - 1
tools/testing/selftests/ftrace/test.d/ftrace/func-filter-pid.tc

@@ -51,7 +51,7 @@ do_reset() {
 fail() { # msg
     do_reset
     echo $1
-    exit $FAIL
+    exit_fail
 }
 
 yield() {

+ 2 - 3
tools/testing/selftests/ftrace/test.d/ftrace/func_event_triggers.tc

@@ -27,7 +27,7 @@ do_reset() {
 fail() { # mesg
     do_reset
     echo $1
-    exit $FAIL
+    exit_fail
 }
 
 SLEEP_TIME=".1"
@@ -48,8 +48,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
 }
 

+ 1 - 1
tools/testing/selftests/ftrace/test.d/ftrace/func_profiler.tc

@@ -32,7 +32,7 @@ fail() { # mesg
     reset_tracer
     echo > set_ftrace_filter
     echo $1
-    exit $FAIL
+    exit_fail
 }
 
 echo "Testing function tracer with profiler:"

+ 1 - 1
tools/testing/selftests/ftrace/test.d/ftrace/func_set_ftrace_file.tc

@@ -26,7 +26,7 @@ do_reset() {
 fail() { # mesg
     do_reset
     echo $1
-    exit $FAIL
+    exit_fail
 }
 
 do_reset

+ 1 - 1
tools/testing/selftests/ftrace/test.d/ftrace/func_traceonoff_triggers.tc

@@ -27,7 +27,7 @@ do_reset() {
 fail() { # mesg
     do_reset
     echo $1
-    exit $FAIL
+    exit_fail
 }
 
 SLEEP_TIME=".1"

+ 1 - 1
tools/testing/selftests/ftrace/test.d/instances/instance-event.tc

@@ -11,7 +11,7 @@ fail() { # mesg
     rmdir foo 2>/dev/null
     echo $1
     set -e
-    exit $FAIL
+    exit_fail
 }
 
 cd instances

+ 1 - 1
tools/testing/selftests/ftrace/test.d/instances/instance.tc

@@ -11,7 +11,7 @@ fail() { # mesg
     rmdir x y z 2>/dev/null
     echo $1
     set -e
-    exit $FAIL
+    exit_fail
 }
 
 cd instances

+ 1 - 1
tools/testing/selftests/ftrace/test.d/kprobe/busy_check.tc

@@ -9,7 +9,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

+ 1 - 1
tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args.tc

@@ -14,5 +14,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
 

+ 1 - 1
tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_type.tc

@@ -35,4 +35,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

+ 1 - 1
tools/testing/selftests/ftrace/test.d/kprobe/kretprobe_args.tc

@@ -14,4 +14,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

+ 1 - 0
tools/testing/selftests/ftrace/test.d/template

@@ -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

+ 1 - 1
tools/testing/selftests/ftrace/test.d/trigger/trigger-eventonoff.tc

@@ -12,7 +12,7 @@ do_reset() {
 fail() { #msg
     do_reset
     echo $1
-    exit $FAIL
+    exit_fail
 }
 
 if [ ! -f set_event -o ! -d events/sched ]; then

+ 1 - 1
tools/testing/selftests/ftrace/test.d/trigger/trigger-filter.tc

@@ -12,7 +12,7 @@ do_reset() {
 fail() { #msg
     do_reset
     echo $1
-    exit $FAIL
+    exit_fail
 }
 
 if [ ! -f set_event -o ! -d events/sched ]; then

+ 1 - 1
tools/testing/selftests/ftrace/test.d/trigger/trigger-hist-mod.tc

@@ -12,7 +12,7 @@ do_reset() {
 fail() { #msg
     do_reset
     echo $1
-    exit $FAIL
+    exit_fail
 }
 
 if [ ! -f set_event -o ! -d events/sched ]; then

+ 1 - 1
tools/testing/selftests/ftrace/test.d/trigger/trigger-hist.tc

@@ -12,7 +12,7 @@ do_reset() {
 fail() { #msg
     do_reset
     echo $1
-    exit $FAIL
+    exit_fail
 }
 
 if [ ! -f set_event -o ! -d events/sched ]; then

+ 1 - 1
tools/testing/selftests/ftrace/test.d/trigger/trigger-multihist.tc

@@ -12,7 +12,7 @@ do_reset() {
 fail() { #msg
     do_reset
     echo $1
-    exit $FAIL
+    exit_fail
 }
 
 if [ ! -f set_event -o ! -d events/sched ]; then

+ 1 - 1
tools/testing/selftests/ftrace/test.d/trigger/trigger-snapshot.tc

@@ -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

+ 1 - 1
tools/testing/selftests/ftrace/test.d/trigger/trigger-stacktrace.tc

@@ -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

+ 1 - 1
tools/testing/selftests/ftrace/test.d/trigger/trigger-traceonoff.tc

@@ -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