diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-29 13:20:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-29 13:20:02 -0700 |
| commit | 2b28601d62b01429d12e999fe3712aaf57ca2e26 (patch) | |
| tree | 8d97918fbcdf98a77788e89dbe21f3cc0cf5dc04 /tools/testing/selftests/ftrace/test.d/kprobe/kprobe_ftrace.tc | |
| parent | 9e82b4a91d46a690de3cbbe6960667caa508b27a (diff) | |
| parent | eff82a263b5cfa3427fd9dbfedd96da94fdc9f19 (diff) | |
Merge tag 'linux-kselftest-5.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
Pull Kselftest fixes from Shuah Khan:
- Alexandre Belloni's fixes to rtc regressions introduced in kselftest
Makefile test run output refactoring work from Kees Cook.
- ftrace test checkbashisms fixes from Masami Hiramatsu
* tag 'linux-kselftest-5.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
selftests: rtc: rtctest: specify timeouts
selftests/harness: Allow test to configure timeout
selftests/ftrace: Add checkbashisms meta-testcase
selftests/ftrace: Make a script checkbashisms clean
Diffstat (limited to 'tools/testing/selftests/ftrace/test.d/kprobe/kprobe_ftrace.tc')
| -rw-r--r-- | tools/testing/selftests/ftrace/test.d/kprobe/kprobe_ftrace.tc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_ftrace.tc b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_ftrace.tc index 492426e95e09..7650a82db3f5 100644 --- a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_ftrace.tc +++ b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_ftrace.tc @@ -3,7 +3,7 @@ # description: Kprobe dynamic event with function tracer [ -f kprobe_events ] || exit_unsupported # this is configurable -grep function available_tracers || exit_unsupported # this is configurable +grep "function" available_tracers || exit_unsupported # this is configurable # prepare echo nop > current_tracer |