From e4d1065b315b433f224920f1617bc3783230501c Mon Sep 17 00:00:00 2001 From: Paul Elder Date: Fri, 16 Jun 2017 00:54:22 +0900 Subject: 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 Signed-off-by: Shuah Khan --- tools/testing/selftests/membarrier/membarrier_test.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'tools/testing/selftests/membarrier/membarrier_test.c') 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(); -- cgit v1.2.3-59-g8ed1b