Commit e4d1065b authored by Paul Elder's avatar Paul Elder Committed by Shuah Khan

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: default avatarPaul Elder <paul.elder@pitt.edu>
Signed-off-by: default avatarShuah Khan <shuahkh@osg.samsung.com>
parent 54f57baa
...@@ -101,9 +101,8 @@ static bool set_watchpoint(pid_t pid, int size, int wp) ...@@ -101,9 +101,8 @@ static bool set_watchpoint(pid_t pid, int size, int wp)
return true; return true;
if (errno == EIO) { 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"); "not supported on this hardware\n");
ksft_exit_skip();
} }
perror("ptrace(PTRACE_SETREGSET, NT_ARM_HW_WATCH) failed"); perror("ptrace(PTRACE_SETREGSET, NT_ARM_HW_WATCH) failed");
return false; return false;
......
...@@ -83,8 +83,8 @@ bool run_test(int cpu) ...@@ -83,8 +83,8 @@ bool run_test(int cpu)
if (ptrace(PTRACE_SINGLESTEP, pid, NULL, NULL) < 0) { if (ptrace(PTRACE_SINGLESTEP, pid, NULL, NULL) < 0) {
if (errno == EIO) { if (errno == EIO) {
printf("ptrace(PTRACE_SINGLESTEP) not supported on this architecture\n"); ksft_exit_skip("ptrace(PTRACE_SINGLESTEP) "
ksft_exit_skip(); "not supported on this architecture");
} }
perror("ptrace(PTRACE_SINGLESTEP) failed"); perror("ptrace(PTRACE_SINGLESTEP) failed");
return false; return false;
......
...@@ -87,8 +87,7 @@ static enum test_membarrier_status test_membarrier_query(void) ...@@ -87,8 +87,7 @@ static enum test_membarrier_status test_membarrier_query(void)
* It is valid to build a kernel with * It is valid to build a kernel with
* CONFIG_MEMBARRIER=n. However, this skips the tests. * CONFIG_MEMBARRIER=n. However, this skips the tests.
*/ */
ksft_test_result_skip("CONFIG_MEMBARRIER is not enabled\n"); ksft_exit_skip("CONFIG_MEMBARRIER is not enabled\n");
return ksft_exit_skip();
} }
ksft_test_result_fail("sys_membarrier() failed\n"); ksft_test_result_fail("sys_membarrier() failed\n");
return TEST_MEMBARRIER_FAIL; return TEST_MEMBARRIER_FAIL;
...@@ -108,13 +107,13 @@ int main(int argc, char **argv) ...@@ -108,13 +107,13 @@ int main(int argc, char **argv)
case TEST_MEMBARRIER_FAIL: case TEST_MEMBARRIER_FAIL:
return ksft_exit_fail(); return ksft_exit_fail();
case TEST_MEMBARRIER_SKIP: case TEST_MEMBARRIER_SKIP:
return ksft_exit_skip(); return ksft_exit_skip(NULL);
} }
switch (test_membarrier()) { switch (test_membarrier()) {
case TEST_MEMBARRIER_FAIL: case TEST_MEMBARRIER_FAIL:
return ksft_exit_fail(); return ksft_exit_fail();
case TEST_MEMBARRIER_SKIP: case TEST_MEMBARRIER_SKIP:
return ksft_exit_skip(); return ksft_exit_skip(NULL);
} }
return ksft_exit_pass(); return ksft_exit_pass();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment