git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From 46825b77cbae15b2f59d28e4a5b05d2a9ae4c989 Mon Sep 17 00:00:00 2001
   2 From: Sasha Levin <sashal@kernel.org>
   3 Date: Thu, 8 Oct 2020 15:26:31 +0300
   4 Subject: selftests: core: use SKIP instead of XFAIL in close_range_test.c
   5
   6 From: Tommi Rantala <tommi.t.rantala@nokia.com>
   7
   8 [ Upstream commit 1d44d0dd61b6121b49f25b731f2f7f605cb3c896 ]
   9
  10 XFAIL is gone since commit 9847d24af95c ("selftests/harness: Refactor XFAIL
  11 into SKIP"), use SKIP instead.
  12
  13 Fixes: 9847d24af95c ("selftests/harness: Refactor XFAIL into SKIP")
  14 Signed-off-by: Tommi Rantala <tommi.t.rantala@nokia.com>
  15 Reviewed-by: Kees Cook <keescook@chromium.org>
  16 Acked-by: Christian Brauner <christian.brauner@ubuntu.com>
  17 Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
  18 Signed-off-by: Sasha Levin <sashal@kernel.org>
  19 ---
  20  tools/testing/selftests/core/close_range_test.c | 8 ++++----
  21  1 file changed, 4 insertions(+), 4 deletions(-)
  22
  23 diff --git a/tools/testing/selftests/core/close_range_test.c b/tools/testing/selftests/core/close_range_test.c
  24 index c99b98b0d461f..575b391ddc78d 100644
  25 --- a/tools/testing/selftests/core/close_range_test.c
  26 +++ b/tools/testing/selftests/core/close_range_test.c
  27 @@ -44,7 +44,7 @@ TEST(close_range)
  28                 fd = open("/dev/null", O_RDONLY | O_CLOEXEC);
  29                 ASSERT_GE(fd, 0) {
  30                         if (errno == ENOENT)
  31 -                               XFAIL(return, "Skipping test since /dev/null does not exist");
  32 +                               SKIP(return, "Skipping test since /dev/null does not exist");
  33                 }
  34
  35                 open_fds[i] = fd;
  36 @@ -52,7 +52,7 @@ TEST(close_range)
  37
  38         EXPECT_EQ(-1, sys_close_range(open_fds[0], open_fds[100], -1)) {
  39                 if (errno == ENOSYS)
  40 -                       XFAIL(return, "close_range() syscall not supported");
  41 +                       SKIP(return, "close_range() syscall not supported");
  42         }
  43
  44         EXPECT_EQ(0, sys_close_range(open_fds[0], open_fds[50], 0));
  45 @@ -108,7 +108,7 @@ TEST(close_range_unshare)
  46                 fd = open("/dev/null", O_RDONLY | O_CLOEXEC);
  47                 ASSERT_GE(fd, 0) {
  48                         if (errno == ENOENT)
  49 -                               XFAIL(return, "Skipping test since /dev/null does not exist");
  50 +                               SKIP(return, "Skipping test since /dev/null does not exist");
  51                 }
  52
  53                 open_fds[i] = fd;
  54 @@ -197,7 +197,7 @@ TEST(close_range_unshare_capped)
  55                 fd = open("/dev/null", O_RDONLY | O_CLOEXEC);
  56                 ASSERT_GE(fd, 0) {
  57                         if (errno == ENOENT)
  58 -                               XFAIL(return, "Skipping test since /dev/null does not exist");
  59 +                               SKIP(return, "Skipping test since /dev/null does not exist");
  60                 }
  61
  62                 open_fds[i] = fd;
  63 --
  64 2.27.0
  65