aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-10-30 12:47:28 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2018-10-30 12:47:28 -0400
commitf4267b3604a84ff72c013a0e3e467289908603a6 (patch)
treee4d19ae71a3bbaa62dbab2c997b0465f8a2c3303 /tools
parent5b4c0d87de2d4932354ebcf118677c94533f9a01 (diff)
parent0d0352d8b3d6d7ca9a710b40e194cbbaeb841c88 (diff)
Merge tag 'trace-v4.19-rc8-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing fixes from Steven Rostedt: "Masami had a couple more fixes to the synthetic events. One was a proper error return value, and the other is for the self tests" * tag 'trace-v4.19-rc8-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: selftests/ftrace: Fix synthetic event test to delete event correctly tracing: Return -ENOENT if there is no target synthetic event
Diffstat (limited to 'tools')
-rw-r--r--tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-createremove.tc12
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-createremove.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-createremove.tc
index 8d647fb572dd..41128219231a 100644
--- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-createremove.tc
+++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-createremove.tc
@@ -25,18 +25,18 @@ fi
25 25
26reset_trigger 26reset_trigger
27 27
28echo "Test create synthetic event with an error" 28echo "Test remove synthetic event"
29echo 'wakeup_latency u64 lat pid_t pid char' > synthetic_events > /dev/null 29echo '!wakeup_latency u64 lat pid_t pid char comm[16]' >> synthetic_events
30if [ -d events/synthetic/wakeup_latency ]; then 30if [ -d events/synthetic/wakeup_latency ]; then
31 fail "Created wakeup_latency synthetic event with an invalid format" 31 fail "Failed to delete wakeup_latency synthetic event"
32fi 32fi
33 33
34reset_trigger 34reset_trigger
35 35
36echo "Test remove synthetic event" 36echo "Test create synthetic event with an error"
37echo '!wakeup_latency u64 lat pid_t pid char comm[16]' > synthetic_events 37echo 'wakeup_latency u64 lat pid_t pid char' > synthetic_events > /dev/null
38if [ -d events/synthetic/wakeup_latency ]; then 38if [ -d events/synthetic/wakeup_latency ]; then
39 fail "Failed to delete wakeup_latency synthetic event" 39 fail "Created wakeup_latency synthetic event with an invalid format"
40fi 40fi
41 41
42exit 0 42exit 0