Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3280952 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Pull ftrace self-test updates from Steven Rostedt:
 "Updates for the ftrace self tests:

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

* tag 'ftracetest-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  ftracetest: Add --verbose option for showing echo output
  ftracetest: Fix to show descriptions on dash
  ftracetest: Add basic event tracing test cases
  ftracetest: Clear trace buffer after running kprobe testcases
  ftracetest: Use logfile name supported by busybox's mktemp
  ftracetest: Add a couple of ftrace test cases
  ftracetest: Add functions file that holds helper functions
  ftracetest: Sort testcases
  ftracetest: Add kprobes on ftrace testcase
parents 1dd7dcb6 57cee236
Loading
Loading
Loading
Loading
+30 −13
Original line number Diff line number Diff line
@@ -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
+5 −0
Original line number Diff line number Diff line
#!/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
+53 −0
Original line number Diff line number Diff line
#!/bin/sh
# description: event tracing - enable/disable with event level files

do_reset() {
    echo > set_event
    clear_trace
}

fail() { #msg
    do_reset
    echo $1
    exit -1
}

if [ ! -f set_event -o ! -d events/sched ]; then
    echo "event tracing is not supported"
    exit_unsupported
fi

reset_tracer
do_reset

echo 'sched:sched_switch' > set_event
usleep 1

count=`cat trace | grep sched_switch | wc -l`
if [ $count -eq 0 ]; then
    fail "sched_switch events are not recorded"
fi

do_reset

echo 1 > events/sched/sched_switch/enable
usleep 1

count=`cat trace | grep sched_switch | wc -l`
if [ $count -eq 0 ]; then
    fail "sched_switch events are not recorded"
fi

do_reset

echo 0 > events/sched/sched_switch/enable
usleep 1

count=`cat trace | grep sched_switch | wc -l`
if [ $count -ne 0 ]; then
    fail "sched_switch events should not be recorded"
fi

do_reset

exit 0
+53 −0
Original line number Diff line number Diff line
#!/bin/sh
# description: event tracing - enable/disable with subsystem level files

do_reset() {
    echo > set_event
    clear_trace
}

fail() { #msg
    do_reset
    echo $1
    exit -1
}

if [ ! -f set_event -o ! -d events/sched ]; then
    echo "event tracing is not supported"
    exit_unsupported
fi

reset_tracer
do_reset

echo 'sched:*' > set_event
usleep 1

count=`cat trace | grep -v ^# | awk '{ print $5 }' | sort -u | wc -l`
if [ $count -lt 3 ]; then
    fail "at least fork, exec and exit events should be recorded"
fi

do_reset

echo 1 > events/sched/enable
usleep 1

count=`cat trace | grep -v ^# | awk '{ print $5 }' | sort -u | wc -l`
if [ $count -lt 3 ]; then
    fail "at least fork, exec and exit events should be recorded"
fi

do_reset

echo 0 > events/sched/enable
usleep 1

count=`cat trace | grep -v ^# | awk '{ print $5 }' | sort -u | wc -l`
if [ $count -ne 0 ]; then
    fail "any of scheduler events should not be recorded"
fi

do_reset

exit 0
+47 −0
Original line number Diff line number Diff line
#!/bin/sh
# description: event tracing - enable/disable with top level files

do_reset() {
    echo > set_event
    clear_trace
}

fail() { #msg
    do_reset
    echo $1
    exit -1
}

if [ ! -f available_events -o ! -f set_event -o ! -d events ]; then
    echo "event tracing is not supported"
    exit_unsupported
fi

reset_tracer
do_reset

echo '*:*' > set_event
count=`cat trace | grep -v ^# | wc -l`
if [ $count -eq 0 ]; then
    fail "none of events are recorded"
fi

do_reset

echo 1 > events/enable
count=`cat trace | grep -v ^# | wc -l`
if [ $count -eq 0 ]; then
    fail "none of events are recorded"
fi

do_reset

echo 0 > events/enable
count=`cat trace | grep -v ^# | wc -l`
if [ $count -ne 0 ]; then
    fail "any of events should not be recorded"
fi

do_reset

exit 0
Loading