aboutsummaryrefslogtreecommitdiffstats
path: root/tools/testing/selftests/membarrier
diff options
context:
space:
mode:
authorPaul Elder <paul.elder@pitt.edu>2017-06-16 00:54:22 +0900
committerShuah Khan <shuahkh@osg.samsung.com>2017-06-15 18:10:29 -0600
commite4d1065b315b433f224920f1617bc3783230501c (patch)
tree580be6d9207d965e1b227f37ce1c4dee7479681c /tools/testing/selftests/membarrier
parentkselftest: make ksft_exit_skip() output a reason for skipping (diff)
downloadlinux-dev-e4d1065b315b433f224920f1617bc3783230501c.tar.xz
linux-dev-e4d1065b315b433f224920f1617bc3783230501c.zip
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>
Diffstat (limited to 'tools/testing/selftests/membarrier')
-rw-r--r--tools/testing/selftests/membarrier/membarrier_test.c7
1 files changed, 3 insertions, 4 deletions
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();