diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-17 14:56:14 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-17 14:56:14 -0800 |
commit | b1c2a344cc19b40d2f1e7cbd9c2f4f205ae6d650 (patch) | |
tree | aa11b121b2f27d28b5a3d0e186df37945080c03a /tools/testing/selftests/ftrace/test.d/ftrace/func_event_triggers.tc | |
parent | 190b10367b0d311f68dc71e40b254fd4427affc2 (diff) | |
parent | c3e0d179bff503cd56758579a2c33216b40b9b7b (diff) | |
download | op-kernel-dev-b1c2a344cc19b40d2f1e7cbd9c2f4f205ae6d650.zip op-kernel-dev-b1c2a344cc19b40d2f1e7cbd9c2f4f205ae6d650.tar.gz |
Merge tag 'linux-kselftest-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
Pull kselftest updates from Shuah Khan:
"This update to Kselftest consists of cleanup patches, fixes, and a new
test for ion buffer sharing.
Fixes include changes to skip firmware tests on systems that aren't
configured to support them, as opposed to failing them"
* tag 'linux-kselftest-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
selftests: firmware: skip unsupported custom firmware fallback tests
selftests: firmware: skip unsupported async loading tests
selftests: memfd_test.c: fix compilation warning.
selftests/ftrace: Introduce exit_pass and exit_fail
selftests: ftrace: add more config fragments
android/ion: userspace test utility for ion buffer sharing
selftests: remove obsolete kconfig fragment for cpu-hotplug
selftests: vdso_test: support ARM64 targets
selftests/ftrace: Do not use arch dependent do_IRQ as a target function
selftests: breakpoints: fix compile error on breakpoint_test_arm64
selftests: add missing test result status in memory-hotplug test
selftests/exec: include cwd in long path calculation
selftests: seccomp: update .gitignore with newly added tests
selftests: vm: Update .gitignore with newly added tests
selftests: timers: Update .gitignore with newly added tests
Diffstat (limited to 'tools/testing/selftests/ftrace/test.d/ftrace/func_event_triggers.tc')
-rw-r--r-- | tools/testing/selftests/ftrace/test.d/ftrace/func_event_triggers.tc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/testing/selftests/ftrace/test.d/ftrace/func_event_triggers.tc b/tools/testing/selftests/ftrace/test.d/ftrace/func_event_triggers.tc index 9d4afcc..6fed4cf 100644 --- a/tools/testing/selftests/ftrace/test.d/ftrace/func_event_triggers.tc +++ b/tools/testing/selftests/ftrace/test.d/ftrace/func_event_triggers.tc @@ -27,7 +27,7 @@ do_reset() { fail() { # mesg do_reset echo $1 - exit $FAIL + exit_fail } SLEEP_TIME=".1" @@ -48,8 +48,7 @@ test_event_enabled() { e=`cat $EVENT_ENABLE` if [ "$e" != $val ]; then - echo "Expected $val but found $e" - exit 1 + fail "Expected $val but found $e" fi } |