diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2017-12-06 22:39:39 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-12-06 22:39:39 +0100 |
| commit | d6eabce2577a695197e9433302fd6a9f0e1a7666 (patch) | |
| tree | e5c5bcc7803879d5d911cc8faeb74a946c242395 /tools/testing/selftests/ftrace/test.d/event | |
| parent | Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent (diff) | |
| parent | x86: don't hash faulting address in oops printout (diff) | |
| download | linux-dev-d6eabce2577a695197e9433302fd6a9f0e1a7666.tar.xz linux-dev-d6eabce2577a695197e9433302fd6a9f0e1a7666.zip | |
Merge branch 'linus' into perf/urgent, to synchronize UAPI headers
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/testing/selftests/ftrace/test.d/event')
4 files changed, 4 insertions, 4 deletions
diff --git a/tools/testing/selftests/ftrace/test.d/event/event-enable.tc b/tools/testing/selftests/ftrace/test.d/event/event-enable.tc index 6ff851a75884..9daf034186f5 100644 --- a/tools/testing/selftests/ftrace/test.d/event/event-enable.tc +++ b/tools/testing/selftests/ftrace/test.d/event/event-enable.tc @@ -11,7 +11,7 @@ do_reset() { fail() { #msg do_reset echo $1 - exit $FAIL + exit_fail } yield() { diff --git a/tools/testing/selftests/ftrace/test.d/event/event-pid.tc b/tools/testing/selftests/ftrace/test.d/event/event-pid.tc index cc14feec6e1f..132478b305c2 100644 --- a/tools/testing/selftests/ftrace/test.d/event/event-pid.tc +++ b/tools/testing/selftests/ftrace/test.d/event/event-pid.tc @@ -13,7 +13,7 @@ do_reset() { fail() { #msg do_reset echo $1 - exit $FAIL + exit_fail } yield() { diff --git a/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc b/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc index 85094904aa79..6a37a8642ee6 100644 --- a/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc +++ b/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc @@ -11,7 +11,7 @@ do_reset() { fail() { #msg do_reset echo $1 - exit $FAIL + exit_fail } yield() { diff --git a/tools/testing/selftests/ftrace/test.d/event/toplevel-enable.tc b/tools/testing/selftests/ftrace/test.d/event/toplevel-enable.tc index cc1cf4d30ef5..4e9b6e2c0219 100644 --- a/tools/testing/selftests/ftrace/test.d/event/toplevel-enable.tc +++ b/tools/testing/selftests/ftrace/test.d/event/toplevel-enable.tc @@ -10,7 +10,7 @@ do_reset() { fail() { #msg do_reset echo $1 - exit $FAIL + exit_fail } yield() { |