selftests/core: fix close_range_test build after XFAIL removal

XFAIL was removed in commit 9847d24af95c ("selftests/harness: Refactor
XFAIL into SKIP") and its use in close_range_test was already replaced
by commit 1d44d0dd61b6 ("selftests: core: use SKIP instead of XFAIL in
close_range_test.c"). However, commit 23afeaeff3d9 ("selftests: core:
add tests for CLOSE_RANGE_CLOEXEC") introduced usage of XFAIL in
TEST(close_range_cloexec). Use SKIP there as well.

Fixes: 23afeaeff3d9 ("selftests: core: add tests for CLOSE_RANGE_CLOEXEC")
Cc: Giuseppe Scrivano <gscrivan@redhat.com>
Cc: linux-fsdevel@vger.kernel.org
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Acked-by: Christian Brauner <christian.brauner@ubuntu.com>
Link: https://lore.kernel.org/r/20201218112428.13662-1-tklauser@distanz.ch
Link: https://lore.kernel.org/r/20201218145415.801063-1-christian.brauner@ubuntu.com
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/tools/testing/selftests/core/close_range_test.c b/tools/testing/selftests/core/close_range_test.c
index 87e16d65d9d7385f30d1442ec79ca958b1c26044..c97dd1a7abd6c70f29e7e5a171a6ff526d60bd79 100644 (file)
--- a/tools/testing/selftests/core/close_range_test.c
+++ b/tools/testing/selftests/core/close_range_test.c
@@ -102,7 +102,7 @@ TEST(close_range_unshare)
        int i, ret, status;
        pid_t pid;
        int open_fds[101];
-       struct clone_args args = {
+       struct __clone_args args = {
                .flags = CLONE_FILES,
                .exit_signal = SIGCHLD,
        };
@@ -191,7 +191,7 @@ TEST(close_range_unshare_capped)
        int i, ret, status;
        pid_t pid;
        int open_fds[101];
-       struct clone_args args = {
+       struct __clone_args args = {
                .flags = CLONE_FILES,
                .exit_signal = SIGCHLD,
        };
@@ -241,7 +241,7 @@ TEST(close_range_cloexec)
                fd = open("/dev/null", O_RDONLY);
                ASSERT_GE(fd, 0) {
                        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;
@@ -250,9 +250,9 @@ TEST(close_range_cloexec)
        ret = sys_close_range(1000, 1000, CLOSE_RANGE_CLOEXEC);
        if (ret < 0) {
                if (errno == ENOSYS)
-                       XFAIL(return, "close_range() syscall not supported");
+                       SKIP(return, "close_range() syscall not supported");
                if (errno == EINVAL)
-                       XFAIL(return, "close_range() doesn't support CLOSE_RANGE_CLOEXEC");
+                       SKIP(return, "close_range() doesn't support CLOSE_RANGE_CLOEXEC");
        }
 
        /* Ensure the FD_CLOEXEC bit is set also with a resource limit in place.  */