Commit bea24f76 authored by Tom Zanussi's avatar Tom Zanussi Committed by Steven Rostedt (VMware)

selftests/ftrace: Distinguish between hist and synthetic event checks

With synthetic events now a separate config item as a result of
'tracing: Move synthetic events to a separate file', tests that use
both need to explicitly check for hist trigger support rather than
relying on hist triggers to pull in synthetic events.

Add an additional hist trigger check to all the trigger tests that now
require it, otherwise they'll fail if synthetic events but not hist
triggers are enabled.

Link: http://lkml.kernel.org/r/af36c539006ef2768114b4ed38e6b054f7c7a3bd.1590693308.git.zanussi@kernel.orgAcked-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: default avatarTom Zanussi <zanussi@kernel.org>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parent 726721a5
...@@ -17,6 +17,11 @@ if [ ! -f synthetic_events ]; then ...@@ -17,6 +17,11 @@ if [ ! -f synthetic_events ]; then
exit_unsupported exit_unsupported
fi fi
if [ ! -f events/sched/sched_process_fork/hist ]; then
echo "hist trigger is not supported"
exit_unsupported
fi
echo "Test field variable support" echo "Test field variable support"
echo 'wakeup_latency u64 lat; pid_t pid; int prio; char comm[16]' > synthetic_events echo 'wakeup_latency u64 lat; pid_t pid; int prio; char comm[16]' > synthetic_events
......
...@@ -17,6 +17,11 @@ if [ ! -f synthetic_events ]; then ...@@ -17,6 +17,11 @@ if [ ! -f synthetic_events ]; then
exit_unsupported exit_unsupported
fi fi
if [ ! -f events/sched/sched_process_fork/hist ]; then
echo "hist trigger is not supported"
exit_unsupported
fi
echo "Test create synthetic event" echo "Test create synthetic event"
echo 'waking_latency u64 lat pid_t pid' > synthetic_events echo 'waking_latency u64 lat pid_t pid' > synthetic_events
......
...@@ -17,6 +17,11 @@ if [ ! -f synthetic_events ]; then ...@@ -17,6 +17,11 @@ if [ ! -f synthetic_events ]; then
exit_unsupported exit_unsupported
fi fi
if [ ! -f events/sched/sched_process_fork/hist ]; then
echo "hist trigger is not supported"
exit_unsupported
fi
echo "Test multiple actions on hist trigger" echo "Test multiple actions on hist trigger"
echo 'wakeup_latency u64 lat; pid_t pid' >> synthetic_events echo 'wakeup_latency u64 lat; pid_t pid' >> synthetic_events
TRIGGER1=events/sched/sched_wakeup/trigger TRIGGER1=events/sched/sched_wakeup/trigger
......
...@@ -17,6 +17,11 @@ if [ ! -f synthetic_events ]; then ...@@ -17,6 +17,11 @@ if [ ! -f synthetic_events ]; then
exit_unsupported exit_unsupported
fi fi
if [ ! -f events/sched/sched_process_fork/hist ]; then
echo "hist trigger is not supported"
exit_unsupported
fi
echo "Test create synthetic event" echo "Test create synthetic event"
echo 'wakeup_latency u64 lat pid_t pid char comm[16]' > synthetic_events echo 'wakeup_latency u64 lat pid_t pid char comm[16]' > synthetic_events
......
...@@ -17,6 +17,11 @@ if [ ! -f synthetic_events ]; then ...@@ -17,6 +17,11 @@ if [ ! -f synthetic_events ]; then
exit_unsupported exit_unsupported
fi fi
if [ ! -f events/sched/sched_process_fork/hist ]; then
echo "hist trigger is not supported"
exit_unsupported
fi
echo "Test create synthetic event" echo "Test create synthetic event"
echo 'wakeup_latency u64 lat pid_t pid char comm[16]' > synthetic_events echo 'wakeup_latency u64 lat pid_t pid char comm[16]' > synthetic_events
......
...@@ -17,6 +17,11 @@ if [ ! -f synthetic_events ]; then ...@@ -17,6 +17,11 @@ if [ ! -f synthetic_events ]; then
exit_unsupported exit_unsupported
fi fi
if [ ! -f events/sched/sched_process_fork/hist ]; then
echo "hist trigger is not supported"
exit_unsupported
fi
echo "Test create synthetic event" echo "Test create synthetic event"
echo 'wakeup_latency u64 lat pid_t pid char comm[16]' > synthetic_events echo 'wakeup_latency u64 lat pid_t pid char comm[16]' > synthetic_events
......
...@@ -12,6 +12,11 @@ if [ ! -f set_event ]; then ...@@ -12,6 +12,11 @@ if [ ! -f set_event ]; then
exit_unsupported exit_unsupported
fi fi
if [ ! -f events/sched/sched_process_fork/hist ]; then
echo "hist trigger is not supported"
exit_unsupported
fi
if [ ! -f snapshot ]; then if [ ! -f snapshot ]; then
echo "snapshot is not supported" echo "snapshot is not supported"
exit_unsupported exit_unsupported
......
...@@ -17,6 +17,11 @@ if [ ! -f synthetic_events ]; then ...@@ -17,6 +17,11 @@ if [ ! -f synthetic_events ]; then
exit_unsupported exit_unsupported
fi fi
if [ ! -f events/sched/sched_process_fork/hist ]; then
echo "hist trigger is not supported"
exit_unsupported
fi
grep -q "trace(<synthetic_event>" README || exit_unsupported # version issue grep -q "trace(<synthetic_event>" README || exit_unsupported # version issue
echo "Test create synthetic event" echo "Test create synthetic event"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment