selftests: core: use SKIP instead of XFAIL in close_range_test.c

XFAIL is gone since commit 9847d24af9 ("selftests/harness: Refactor XFAIL
into SKIP"), use SKIP instead.

Fixes: 9847d24af9 ("selftests/harness: Refactor XFAIL into SKIP")
Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Acked-by: Christian Brauner <christian.brauner@ubuntu.com>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
This commit is contained in:
Tommi Rantala 2020-10-08 15:26:31 +03:00 committed by Shuah Khan
parent f3ae6c6e8a
commit 1d44d0dd61
1 changed files with 4 additions and 4 deletions

View File

@ -44,7 +44,7 @@ TEST(close_range)
fd = open("/dev/null", O_RDONLY | O_CLOEXEC); fd = open("/dev/null", O_RDONLY | O_CLOEXEC);
ASSERT_GE(fd, 0) { ASSERT_GE(fd, 0) {
if (errno == ENOENT) if (errno == ENOENT)
XFAIL(return, "Skipping test since /dev/null does not exist"); SKIP(return, "Skipping test since /dev/null does not exist");
} }
open_fds[i] = fd; open_fds[i] = fd;
@ -52,7 +52,7 @@ TEST(close_range)
EXPECT_EQ(-1, sys_close_range(open_fds[0], open_fds[100], -1)) { EXPECT_EQ(-1, sys_close_range(open_fds[0], open_fds[100], -1)) {
if (errno == ENOSYS) if (errno == ENOSYS)
XFAIL(return, "close_range() syscall not supported"); SKIP(return, "close_range() syscall not supported");
} }
EXPECT_EQ(0, sys_close_range(open_fds[0], open_fds[50], 0)); EXPECT_EQ(0, sys_close_range(open_fds[0], open_fds[50], 0));
@ -108,7 +108,7 @@ TEST(close_range_unshare)
fd = open("/dev/null", O_RDONLY | O_CLOEXEC); fd = open("/dev/null", O_RDONLY | O_CLOEXEC);
ASSERT_GE(fd, 0) { ASSERT_GE(fd, 0) {
if (errno == ENOENT) if (errno == ENOENT)
XFAIL(return, "Skipping test since /dev/null does not exist"); SKIP(return, "Skipping test since /dev/null does not exist");
} }
open_fds[i] = fd; open_fds[i] = fd;
@ -197,7 +197,7 @@ TEST(close_range_unshare_capped)
fd = open("/dev/null", O_RDONLY | O_CLOEXEC); fd = open("/dev/null", O_RDONLY | O_CLOEXEC);
ASSERT_GE(fd, 0) { ASSERT_GE(fd, 0) {
if (errno == ENOENT) if (errno == ENOENT)
XFAIL(return, "Skipping test since /dev/null does not exist"); SKIP(return, "Skipping test since /dev/null does not exist");
} }
open_fds[i] = fd; open_fds[i] = fd;