diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-23 07:00:09 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-23 07:00:09 -0500 |
| commit | 398d999f96bf8e02573b0c7e32896c7812393bc0 (patch) | |
| tree | 839f1616cc205b9a74f07f7b571a603814446de6 /tools/testing/selftests/ftrace/test.d/kprobe/multiple_kprobes.tc | |
| parent | staging: nvec: check return value (diff) | |
| parent | Linux 5.5-rc3 (diff) | |
| download | linux-dev-398d999f96bf8e02573b0c7e32896c7812393bc0.tar.xz linux-dev-398d999f96bf8e02573b0c7e32896c7812393bc0.zip | |
Merge 5.5-rc3 into staging-next
We need the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/testing/selftests/ftrace/test.d/kprobe/multiple_kprobes.tc')
| -rw-r--r-- | tools/testing/selftests/ftrace/test.d/kprobe/multiple_kprobes.tc | 6 |
1 files 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 |