diff options
| author | Paul Elder <paul.elder@pitt.edu> | 2017-06-16 00:54:22 +0900 |
|---|---|---|
| committer | Shuah Khan <shuahkh@osg.samsung.com> | 2017-06-15 18:10:29 -0600 |
| commit | e4d1065b315b433f224920f1617bc3783230501c (patch) | |
| tree | 580be6d9207d965e1b227f37ce1c4dee7479681c | |
| parent | 54f57baab644e99b6da34d9538b2a9c0a05b690d (diff) | |
| download | linux-e4d1065b315b433f224920f1617bc3783230501c.tar.bz2 | |
kselftest: make callers of ksft_exit_skip() output the reason for skipping
Make the three tests that did use the old ksft_ext_skip()
(breakpoints/breakpoint_test_arm64, breakpoints/step_after_suspend_test,
and membarrier_test) use the new one, with an output for the
reason for skipping all the tests.
Signed-off-by: Paul Elder <paul.elder@pitt.edu>
Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
3 files changed, 6 insertions, 8 deletions
diff --git a/tools/testing/selftests/breakpoints/breakpoint_test_arm64.c b/tools/testing/selftests/breakpoints/breakpoint_test_arm64.c index 3897e996541e..fa6d57af5217 100644 --- a/tools/testing/selftests/breakpoints/breakpoint_test_arm64.c +++ b/tools/testing/selftests/breakpoints/breakpoint_test_arm64.c @@ -101,9 +101,8 @@ static bool set_watchpoint(pid_t pid, int size, int wp) return true; if (errno == EIO) { - printf("ptrace(PTRACE_SETREGSET, NT_ARM_HW_WATCH) " + ksft_exit_skip("ptrace(PTRACE_SETREGSET, NT_ARM_HW_WATCH) " "not supported on this hardware\n"); - ksft_exit_skip(); } perror("ptrace(PTRACE_SETREGSET, NT_ARM_HW_WATCH) failed"); return false; diff --git a/tools/testing/selftests/breakpoints/step_after_suspend_test.c b/tools/testing/selftests/breakpoints/step_after_suspend_test.c index bf37c1087f25..c60c2effb6bc 100644 --- a/tools/testing/selftests/breakpoints/step_after_suspend_test.c +++ b/tools/testing/selftests/breakpoints/step_after_suspend_test.c @@ -83,8 +83,8 @@ bool run_test(int cpu) if (ptrace(PTRACE_SINGLESTEP, pid, NULL, NULL) < 0) { if (errno == EIO) { - printf("ptrace(PTRACE_SINGLESTEP) not supported on this architecture\n"); - ksft_exit_skip(); + ksft_exit_skip("ptrace(PTRACE_SINGLESTEP) " + "not supported on this architecture"); } perror("ptrace(PTRACE_SINGLESTEP) failed"); return false; diff --git a/tools/testing/selftests/membarrier/membarrier_test.c b/tools/testing/selftests/membarrier/membarrier_test.c index cae8c984dfb0..18cb9d1da4e4 100644 --- a/tools/testing/selftests/membarrier/membarrier_test.c +++ b/tools/testing/selftests/membarrier/membarrier_test.c @@ -87,8 +87,7 @@ static enum test_membarrier_status test_membarrier_query(void) * It is valid to build a kernel with * CONFIG_MEMBARRIER=n. However, this skips the tests. */ - ksft_test_result_skip("CONFIG_MEMBARRIER is not enabled\n"); - return ksft_exit_skip(); + ksft_exit_skip("CONFIG_MEMBARRIER is not enabled\n"); } ksft_test_result_fail("sys_membarrier() failed\n"); return TEST_MEMBARRIER_FAIL; @@ -108,13 +107,13 @@ int main(int argc, char **argv) case TEST_MEMBARRIER_FAIL: return ksft_exit_fail(); case TEST_MEMBARRIER_SKIP: - return ksft_exit_skip(); + return ksft_exit_skip(NULL); } switch (test_membarrier()) { case TEST_MEMBARRIER_FAIL: return ksft_exit_fail(); case TEST_MEMBARRIER_SKIP: - return ksft_exit_skip(); + return ksft_exit_skip(NULL); } return ksft_exit_pass(); |