ftracetest: Fix hist unsupported result in hist selftests
When histograms are not configured in the kernel, the ftracetest histogram
selftests should return "unsupported" and not "Failed". To detect this, the
test scripts have:
FEATURE=`grep hist events/sched/sched_process_fork/trigger`
if [ -z "$FEATURE" ]; then
echo "hist trigger is not supported"
exit_unsupported
fi
The problem is that '-e' is in effect and any error will cause the program
to terminate. The grep for 'hist' fails, because it is not compiled it (thus
unsupported), but because grep has an error code for failing to find the
string, it causes the program to terminate, and is marked as a failed test.
Namhyung Kim recommended to test for the "hist" file located in
events/sched/sched_process_fork/hist instead, as it is more inline with the
other checks. As the hist file is only created if the histogram feature is
enabled, that is a valid check.
Link: http://lkml.kernel.org/r/20160523151538.4ea9ce0c@gandalf.local.home
Suggested-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
Fixes: 76929ab51f
("kselftests/ftrace: Add hist trigger testcases")
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
parent
70c8217acd
commit
0ded5174e9
|
@ -23,15 +23,14 @@ if [ ! -f events/sched/sched_process_fork/trigger ]; then
|
||||||
exit_unsupported
|
exit_unsupported
|
||||||
fi
|
fi
|
||||||
|
|
||||||
reset_tracer
|
if [ ! -f events/sched/sched_process_fork/hist ]; then
|
||||||
do_reset
|
|
||||||
|
|
||||||
FEATURE=`grep hist events/sched/sched_process_fork/trigger`
|
|
||||||
if [ -z "$FEATURE" ]; then
|
|
||||||
echo "hist trigger is not supported"
|
echo "hist trigger is not supported"
|
||||||
exit_unsupported
|
exit_unsupported
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
reset_tracer
|
||||||
|
do_reset
|
||||||
|
|
||||||
echo "Test histogram with execname modifier"
|
echo "Test histogram with execname modifier"
|
||||||
|
|
||||||
echo 'hist:keys=common_pid.execname' > events/sched/sched_process_fork/trigger
|
echo 'hist:keys=common_pid.execname' > events/sched/sched_process_fork/trigger
|
||||||
|
|
|
@ -23,15 +23,14 @@ if [ ! -f events/sched/sched_process_fork/trigger ]; then
|
||||||
exit_unsupported
|
exit_unsupported
|
||||||
fi
|
fi
|
||||||
|
|
||||||
reset_tracer
|
if [ ! -f events/sched/sched_process_fork/hist ]; then
|
||||||
do_reset
|
|
||||||
|
|
||||||
FEATURE=`grep hist events/sched/sched_process_fork/trigger`
|
|
||||||
if [ -z "$FEATURE" ]; then
|
|
||||||
echo "hist trigger is not supported"
|
echo "hist trigger is not supported"
|
||||||
exit_unsupported
|
exit_unsupported
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
reset_tracer
|
||||||
|
do_reset
|
||||||
|
|
||||||
echo "Test histogram basic tigger"
|
echo "Test histogram basic tigger"
|
||||||
|
|
||||||
echo 'hist:keys=parent_pid:vals=child_pid' > events/sched/sched_process_fork/trigger
|
echo 'hist:keys=parent_pid:vals=child_pid' > events/sched/sched_process_fork/trigger
|
||||||
|
|
|
@ -23,15 +23,14 @@ if [ ! -f events/sched/sched_process_fork/trigger ]; then
|
||||||
exit_unsupported
|
exit_unsupported
|
||||||
fi
|
fi
|
||||||
|
|
||||||
reset_tracer
|
if [ ! -f events/sched/sched_process_fork/hist ]; then
|
||||||
do_reset
|
|
||||||
|
|
||||||
FEATURE=`grep hist events/sched/sched_process_fork/trigger`
|
|
||||||
if [ -z "$FEATURE" ]; then
|
|
||||||
echo "hist trigger is not supported"
|
echo "hist trigger is not supported"
|
||||||
exit_unsupported
|
exit_unsupported
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
reset_tracer
|
||||||
|
do_reset
|
||||||
|
|
||||||
reset_trigger
|
reset_trigger
|
||||||
|
|
||||||
echo "Test histogram multiple tiggers"
|
echo "Test histogram multiple tiggers"
|
||||||
|
|
Loading…
Reference in New Issue