| From 60336bfa1b5dd893a6a4b1c5dba271c735712472 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 26 Nov 2019 17:34:42 +0900 |
| Subject: selftests/ftrace: Fix multiple kprobe testcase |
| |
| From: Masami Hiramatsu <mhiramat@kernel.org> |
| |
| [ Upstream commit 5cc6c8d4a99d0ee4d5466498e258e593df1d3eb6 ] |
| |
| Fix multiple kprobe event testcase to work it correctly. |
| There are 2 bugfixes. |
| - Since `wc -l FILE` returns not only line number but also |
| FILE filename, following "if" statement always failed. |
| Fix this bug by replacing it with 'cat FILE | wc -l' |
| - Since "while do-done loop" block with pipeline becomes a |
| subshell, $N local variable is not update outside of |
| the loop. |
| Fix this bug by using actual target number (256) instead |
| of $N. |
| |
| 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: Sasha Levin <sashal@kernel.org> |
| --- |
| .../selftests/ftrace/test.d/kprobe/multiple_kprobes.tc | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| diff --git a/tools/testing/selftests/ftrace/test.d/kprobe/multiple_kprobes.tc b/tools/testing/selftests/ftrace/test.d/kprobe/multiple_kprobes.tc |
| index 5862eee91e1d..6e3dbe5f96b7 100644 |
| --- a/tools/testing/selftests/ftrace/test.d/kprobe/multiple_kprobes.tc |
| +++ b/tools/testing/selftests/ftrace/test.d/kprobe/multiple_kprobes.tc |
| @@ -20,9 +20,9 @@ while read i; do |
| test $N -eq 256 && break |
| done |
| |
| -L=`wc -l kprobe_events` |
| -if [ $L -ne $N ]; then |
| - echo "The number of kprobes events ($L) is not $N" |
| +L=`cat kprobe_events | wc -l` |
| +if [ $L -ne 256 ]; then |
| + echo "The number of kprobes events ($L) is not 256" |
| exit_fail |
| fi |
| |
| -- |
| 2.20.1 |
| |
