| From 034c15ff7984d87fc7251f69279a524eef8ae091 Mon Sep 17 00:00:00 2001 |
| From: Masami Hiramatsu <mhiramat@kernel.org> |
| Date: Tue, 26 Nov 2019 17:34:33 +0900 |
| Subject: [PATCH] selftests/ftrace: Do not to use absolute debugfs path |
| |
| commit ba1b9c5048e43716921abe3a1db19cebebf4a5f5 upstream. |
| |
| Use relative path to trigger file instead of absolute debugfs path, |
| because if the user uses tracefs instead of debugfs, it can be |
| mounted at /sys/kernel/tracing. |
| Anyway, since the ftracetest is designed to be run at the tracing |
| directory, user doesn't need to use absolute path. |
| |
| Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org> |
| Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org> |
| Signed-off-by: Shuah Khan <skhan@linuxfoundation.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-action-hist-xfail.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-action-hist-xfail.tc |
| index 1221240f8cf6..3f2aee115f6e 100644 |
| --- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-action-hist-xfail.tc |
| +++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-action-hist-xfail.tc |
| @@ -21,10 +21,10 @@ grep -q "snapshot()" README || exit_unsupported # version issue |
| |
| echo "Test expected snapshot action failure" |
| |
| -echo 'hist:keys=comm:onmatch(sched.sched_wakeup).snapshot()' >> /sys/kernel/debug/tracing/events/sched/sched_waking/trigger && exit_fail |
| +echo 'hist:keys=comm:onmatch(sched.sched_wakeup).snapshot()' >> events/sched/sched_waking/trigger && exit_fail |
| |
| echo "Test expected save action failure" |
| |
| -echo 'hist:keys=comm:onmatch(sched.sched_wakeup).save(comm,prio)' >> /sys/kernel/debug/tracing/events/sched/sched_waking/trigger && exit_fail |
| +echo 'hist:keys=comm:onmatch(sched.sched_wakeup).save(comm,prio)' >> events/sched/sched_waking/trigger && exit_fail |
| |
| exit_xfail |
| diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onchange-action-hist.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onchange-action-hist.tc |
| index 064a284e4e75..c80007aa9f86 100644 |
| --- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onchange-action-hist.tc |
| +++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onchange-action-hist.tc |
| @@ -16,7 +16,7 @@ grep -q "onchange(var)" README || exit_unsupported # version issue |
| |
| echo "Test onchange action" |
| |
| -echo 'hist:keys=comm:newprio=prio:onchange($newprio).save(comm,prio) if comm=="ping"' >> /sys/kernel/debug/tracing/events/sched/sched_waking/trigger |
| +echo 'hist:keys=comm:newprio=prio:onchange($newprio).save(comm,prio) if comm=="ping"' >> events/sched/sched_waking/trigger |
| |
| ping $LOCALHOST -c 3 |
| nice -n 1 ping $LOCALHOST -c 3 |
| diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-snapshot-action-hist.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-snapshot-action-hist.tc |
| index 18fff69fc433..f546c1b66a9b 100644 |
| --- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-snapshot-action-hist.tc |
| +++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-snapshot-action-hist.tc |
| @@ -23,9 +23,9 @@ grep -q "snapshot()" README || exit_unsupported # version issue |
| |
| echo "Test snapshot action" |
| |
| -echo 1 > /sys/kernel/debug/tracing/events/sched/enable |
| +echo 1 > events/sched/enable |
| |
| -echo 'hist:keys=comm:newprio=prio:onchange($newprio).save(comm,prio):onchange($newprio).snapshot() if comm=="ping"' >> /sys/kernel/debug/tracing/events/sched/sched_waking/trigger |
| +echo 'hist:keys=comm:newprio=prio:onchange($newprio).save(comm,prio):onchange($newprio).snapshot() if comm=="ping"' >> events/sched/sched_waking/trigger |
| |
| ping $LOCALHOST -c 3 |
| nice -n 1 ping $LOCALHOST -c 3 |
| -- |
| 2.7.4 |
| |