aboutsummaryrefslogtreecommitdiffstats
path: root/tools/testing/selftests/membarrier/membarrier_test.c
diff options
context:
space:
mode:
authorPaul Elder <paul.elder@pitt.edu>2017-06-12 08:56:48 +0200
committerShuah Khan <shuahkh@osg.samsung.com>2017-06-13 12:57:44 -0600
commit326f57a4c378f4dacf8fbeb05a1decfeff74f54e (patch)
tree0d55cee4315c880e482890ad5861a0e93b57e0ec /tools/testing/selftests/membarrier/membarrier_test.c
parentkselftest: add TAP13 conformant versions of ksft_* functions (diff)
downloadlinux-dev-326f57a4c378f4dacf8fbeb05a1decfeff74f54e.tar.xz
linux-dev-326f57a4c378f4dacf8fbeb05a1decfeff74f54e.zip
kselftest: membarrier: convert to TAP13 output
Make the membarrier test output in the TAP13 format by using the TAP13 output functions defined in kselftest.h Signed-off-by: Paul Elder <paul.elder@pitt.edu> Signed-off-by: Alice Ferrazzi <alice.ferrazzi@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
Diffstat (limited to 'tools/testing/selftests/membarrier/membarrier_test.c')
-rw-r--r--tools/testing/selftests/membarrier/membarrier_test.c35
1 files changed, 19 insertions, 16 deletions
diff --git a/tools/testing/selftests/membarrier/membarrier_test.c b/tools/testing/selftests/membarrier/membarrier_test.c
index 535f0fef4d0b..cae8c984dfb0 100644
--- a/tools/testing/selftests/membarrier/membarrier_test.c
+++ b/tools/testing/selftests/membarrier/membarrier_test.c
@@ -21,36 +21,42 @@ static int sys_membarrier(int cmd, int flags)
static enum test_membarrier_status test_membarrier_cmd_fail(void)
{
int cmd = -1, flags = 0;
+ const char *test_name = "membarrier command fail";
if (sys_membarrier(cmd, flags) != -1) {
- printf("membarrier: Wrong command should fail but passed.\n");
+ ksft_test_result_fail(test_name);
return TEST_MEMBARRIER_FAIL;
}
+
+ ksft_test_result_pass(test_name);
return TEST_MEMBARRIER_PASS;
}
static enum test_membarrier_status test_membarrier_flags_fail(void)
{
int cmd = MEMBARRIER_CMD_QUERY, flags = 1;
+ const char *test_name = "Wrong flags should fail";
if (sys_membarrier(cmd, flags) != -1) {
- printf("membarrier: Wrong flags should fail but passed.\n");
+ ksft_test_result_fail(test_name);
return TEST_MEMBARRIER_FAIL;
}
+
+ ksft_test_result_pass(test_name);
return TEST_MEMBARRIER_PASS;
}
static enum test_membarrier_status test_membarrier_success(void)
{
int cmd = MEMBARRIER_CMD_SHARED, flags = 0;
+ const char *test_name = "execute MEMBARRIER_CMD_SHARED";
if (sys_membarrier(cmd, flags) != 0) {
- printf("membarrier: Executing MEMBARRIER_CMD_SHARED failed. %s.\n",
- strerror(errno));
+ ksft_test_result_fail(test_name);
return TEST_MEMBARRIER_FAIL;
}
- printf("membarrier: MEMBARRIER_CMD_SHARED success.\n");
+ ksft_test_result_pass(test_name);
return TEST_MEMBARRIER_PASS;
}
@@ -74,32 +80,30 @@ static enum test_membarrier_status test_membarrier_query(void)
{
int flags = 0, ret;
- printf("membarrier MEMBARRIER_CMD_QUERY ");
ret = sys_membarrier(MEMBARRIER_CMD_QUERY, flags);
if (ret < 0) {
- printf("failed. %s.\n", strerror(errno));
- switch (errno) {
- case ENOSYS:
+ if (errno == ENOSYS) {
/*
* It is valid to build a kernel with
* CONFIG_MEMBARRIER=n. However, this skips the tests.
*/
- return TEST_MEMBARRIER_SKIP;
- case EINVAL:
- default:
- return TEST_MEMBARRIER_FAIL;
+ ksft_test_result_skip("CONFIG_MEMBARRIER is not enabled\n");
+ return ksft_exit_skip();
}
+ ksft_test_result_fail("sys_membarrier() failed\n");
+ return TEST_MEMBARRIER_FAIL;
}
if (!(ret & MEMBARRIER_CMD_SHARED)) {
- printf("command MEMBARRIER_CMD_SHARED is not supported.\n");
+ ksft_test_result_fail("command MEMBARRIER_CMD_SHARED is not supported.\n");
return TEST_MEMBARRIER_FAIL;
}
- printf("syscall available.\n");
+ ksft_test_result_pass("sys_membarrier available");
return TEST_MEMBARRIER_PASS;
}
int main(int argc, char **argv)
{
+ ksft_print_header();
switch (test_membarrier_query()) {
case TEST_MEMBARRIER_FAIL:
return ksft_exit_fail();
@@ -113,6 +117,5 @@ int main(int argc, char **argv)
return ksft_exit_skip();
}
- printf("membarrier: tests done!\n");
return ksft_exit_pass();
}