Skip to contentSkip to conversation

ftracetest: Ftrace self tests for 3.19

GIT PULL Steven Rostedt 1 participant 1 message Dec 8, 2014

Subsystems (2)
lore
Share & tools
lore

Steven Rostedt

author maintainer
#0 lore raw

Linus,

Updates for the ftrace self tests:

o Added kprobes on ftrace testcase
o Sort test cases
o Add file to hold helper functions
o Use logfile name supported by busybox's mktemp
o Clear trace buffer after running kprobe test
o Fix show descriptions when run on dash shell
o Add --verbose option for showing echo output

Please pull the latest ftracetest-3.19 tree, which can be found at:

git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
ftracetest-3.19

Tag SHA1: 7057ffc8fd4f8f8a371a1c9a9123d84ffc6aa4d8 Head SHA1: 57cee23650d768130ff2d80aa4cd0b053feabf97

Heiko Carstens (2):
ftracetest: Add kprobes on ftrace testcase
ftracetest: Sort testcases

Masami Hiramatsu (2):
ftracetest: Fix to show descriptions on dash
ftracetest: Add --verbose option for showing echo output

Namhyung Kim (3):
ftracetest: Use logfile name supported by busybox's mktemp
ftracetest: Clear trace buffer after running kprobe testcases
ftracetest: Add basic event tracing test cases

Steven Rostedt (Red Hat) (2):
ftracetest: Add functions file that holds helper functions
ftracetest: Add a couple of ftrace test cases

----

 tools/testing/selftests/ftrace/ftracetest          | 43 +++++++----
 .../selftests/ftrace/test.d/00basic/basic4.tc      |  5 ++
 .../selftests/ftrace/test.d/event/event-enable.tc  | 53 +++++++++++++
 .../ftrace/test.d/event/subsystem-enable.tc        | 53 +++++++++++++
 .../ftrace/test.d/event/toplevel-enable.tc         | 47 ++++++++++++
 .../ftrace/test.d/ftrace/fgraph-filter-stack.tc    | 89 ++++++++++++++++++++++
 .../ftrace/test.d/ftrace/fgraph-filter.tc          | 52 +++++++++++++
 .../ftrace/test.d/ftrace/func_profiler.tc          | 80 +++++++++++++++++++
 tools/testing/selftests/ftrace/test.d/functions    | 16 ++++
 .../ftrace/test.d/kprobe/add_and_remove.tc         |  1 +
 .../selftests/ftrace/test.d/kprobe/busy_check.tc   |  1 +
 .../selftests/ftrace/test.d/kprobe/kprobe_args.tc  |  1 +
 .../ftrace/test.d/kprobe/kprobe_ftrace.tc          | 55 +++++++++++++
 .../ftrace/test.d/kprobe/kretprobe_args.tc         |  1 +
 14 files changed, 484 insertions(+), 13 deletions(-)

---------------------------

tools/testing/selftests/ftrace/ftracetest +30 -13
index 515247601df4..da48812ab95e 100755
@@ -13,6 +13,7 @@ echo "Usage: ftracetest [options] [testcase(s)] [testcase-directory(s)]"
 echo " Options:"
 echo "		-h|--help  Show help message"
 echo "		-k|--keep  Keep passed test logs"
+echo "		-v|--verbose Show all stdout messages in testcases"
 echo "		-d|--debug Debug mode (trace all shell commands)"
 exit $1
 }
@@ -37,7 +38,7 @@ abspath() {
 }
 
 find_testcases() { #directory
-  echo `find $1 -name \*.tc`
+  echo `find $1 -name \*.tc | sort`
 }
 
 parse_opts() { # opts
@@ -53,6 +54,10 @@ parse_opts() { # opts
       KEEP_LOG=1
       shift 1
     ;;
+    --verbose|-v)
+      VERBOSE=1
+      shift 1
+    ;;
     --debug|-d)
       DEBUG=1
       shift 1
@@ -90,6 +95,7 @@ TEST_CASES=`find_testcases $TEST_DIR`
 LOG_DIR=$TOP_DIR/logs/`date +%Y%m%d-%H%M%S`/
 KEEP_LOG=0
 DEBUG=0
+VERBOSE=0
 # Parse command-line options
 parse_opts $*
 
@@ -135,15 +141,12 @@ TOTAL_RESULT=0
 CASENO=0
 testcase() { # testfile
   CASENO=$((CASENO+1))
-  prlog -n "[$CASENO]"`grep "^#[ \t]*description:" $1 | cut -f2 -d:`
+  desc=`grep "^#[ \t]*description:" $1 | cut -f2 -d:`
+  prlog -n "[$CASENO]$desc"
 }
 
-eval_result() { # retval sigval
-  local retval=$2
-  if [ $2 -eq 0 ]; then
-    test $1 -ne 0 && retval=$FAIL
-  fi
-  case $retval in
+eval_result() { # sigval
+  case $1 in
     $PASS)
       prlog "	[PASS]"
       PASSED_CASES="$PASSED_CASES $CASENO"
@@ -187,6 +190,9 @@ SIG_RESULT=
 SIG_BASE=36	# Use realtime signals
 SIG_PID=$$
 
+SIG_FAIL=$((SIG_BASE + FAIL))
+trap 'SIG_RESULT=$FAIL' $SIG_FAIL
+
 SIG_UNRESOLVED=$((SIG_BASE + UNRESOLVED))
 exit_unresolved () {
   kill -s $SIG_UNRESOLVED $SIG_PID
@@ -215,17 +221,25 @@ exit_xfail () {
 }
 trap 'SIG_RESULT=$XFAIL' $SIG_XFAIL
 
+__run_test() { # testfile
+  # setup PID and PPID, $$ is not updated.
+  (cd $TRACING_DIR; read PID _ < /proc/self/stat ; set -e; set -x; . $1)
+  [ $? -ne 0 ] && kill -s $SIG_FAIL $SIG_PID
+}
+
 # Run one test case
 run_test() { # testfile
   local testname=`basename $1`
-  local testlog=`mktemp --tmpdir=$LOG_DIR ${testname}-XXXXXX.log`
+  local testlog=`mktemp $LOG_DIR/${testname}-log.XXXXXX`
   testcase $1
   echo "execute: "$1 > $testlog
   SIG_RESULT=0
-  # setup PID and PPID, $$ is not updated.
-  (cd $TRACING_DIR; read PID _ < /proc/self/stat ;
-   set -e; set -x; . $1) >> $testlog 2>&1
-  eval_result $? $SIG_RESULT
+  if [ $VERBOSE -ne 0 ]; then
+    __run_test $1 2>> $testlog | tee -a $testlog
+  else
+    __run_test $1 >> $testlog 2>&1
+  fi
+  eval_result $SIG_RESULT
   if [ $? -eq 0 ]; then
     # Remove test log if the test was done as it was expected.
     [ $KEEP_LOG -eq 0 ] && rm $testlog
@@ -235,6 +249,9 @@ run_test() { # testfile
   fi
 }
 
+# load in the helper functions
+. $TEST_DIR/functions
+
 # Main loop
 for t in $TEST_CASES; do
   run_test $t
tools/testing/selftests/ftrace/test.d/00basic/basic4.tc new file +5 -0
new file mode 100644
index 000000000000..fd9c49a13612
@@ -0,0 +1,5 @@
+#!/bin/sh
+# 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 -1
\ No newline at end of file
tools/testing/selftests/ftrace/test.d/event/event-enable.tc new file +53 -0

53 lines not on this page · raw message

tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc new file +53 -0

53 lines not on this page · raw message

tools/testing/selftests/ftrace/test.d/event/toplevel-enable.tc new file +47 -0

47 lines not on this page · raw message

tools/testing/selftests/ftrace/test.d/ftrace/fgraph-filter-stack.tc new file +89 -0

89 lines not on this page · raw message

tools/testing/selftests/ftrace/test.d/ftrace/fgraph-filter.tc new file +52 -0

52 lines not on this page · raw message

tools/testing/selftests/ftrace/test.d/ftrace/func_profiler.tc new file +80 -0

80 lines not on this page · raw message

tools/testing/selftests/ftrace/test.d/functions new file +16 -0
new file mode 100644
index 000000000000..5d8cd06d920f
@@ -0,0 +1,16 @@
+
+clear_trace() { # reset trace output
+    echo > trace
+}
+
+disable_tracing() { # stop trace recording
+    echo 0 > tracing_on
+}
+
+enable_tracing() { # start trace recording
+    echo 1 > tracing_on
+}
+
+reset_tracer() { # reset the current tracer
+    echo nop > current_tracer
+}
tools/testing/selftests/ftrace/test.d/kprobe/add_and_remove.tc +1 -0
index 1b8b665ab2b3..a5a426211129 100644
@@ -9,3 +9,4 @@ echo p:myevent do_fork > kprobe_events
 grep myevent kprobe_events
 test -d events/kprobes/myevent
 echo > kprobe_events
+clear_trace
tools/testing/selftests/ftrace/test.d/kprobe/busy_check.tc +1 -0
index b55c84003587..d8c7bb6581fe 100644
@@ -11,3 +11,4 @@ echo 1 > events/kprobes/myevent/enable
 echo > kprobe_events && exit 1 # 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 -0
index a603d3f8db7b..c45ee2761354 100644
@@ -12,5 +12,6 @@ echo 1 > events/kprobes/testprobe/enable
 ( echo "forked")
 echo 0 > events/kprobes/testprobe/enable
 echo "-:testprobe" >> kprobe_events
+clear_trace
 test -d events/kprobes/testprobe && exit 1 || exit 0
 
tools/testing/selftests/ftrace/test.d/kprobe/kprobe_ftrace.tc new file +55 -0

55 lines not on this page · raw message

tools/testing/selftests/ftrace/test.d/kprobe/kretprobe_args.tc +1 -0
index 283c29e7f7c4..31717985acc7 100644
@@ -12,4 +12,5 @@ echo 1 > events/kprobes/testprobe2/enable
 ( echo "forked")
 echo 0 > events/kprobes/testprobe2/enable
 echo '-:testprobe2' >> kprobe_events
+clear_trace
 test -d events/kprobes/testprobe2 && exit 1 || exit 0