Skip to content

Commit 7d764b6

Browse files
rantalashuahkh
authored andcommitted
selftests: binderfs: use SKIP instead of XFAIL
XFAIL is gone since commit 9847d24 ("selftests/harness: Refactor XFAIL into SKIP"), use SKIP instead. Fixes: 9847d24 ("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>
1 parent afba8b0 commit 7d764b6

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

tools/testing/selftests/filesystems/binderfs/binderfs_test.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ static int __do_binderfs_test(struct __test_metadata *_metadata)
7474
ret = mount(NULL, binderfs_mntpt, "binder", 0, 0);
7575
EXPECT_EQ(ret, 0) {
7676
if (errno == ENODEV)
77-
XFAIL(goto out, "binderfs missing");
77+
SKIP(goto out, "binderfs missing");
7878
TH_LOG("%s - Failed to mount binderfs", strerror(errno));
7979
goto rmdir;
8080
}
@@ -475,10 +475,10 @@ TEST(binderfs_stress)
475475
TEST(binderfs_test_privileged)
476476
{
477477
if (geteuid() != 0)
478-
XFAIL(return, "Tests are not run as root. Skipping privileged tests");
478+
SKIP(return, "Tests are not run as root. Skipping privileged tests");
479479

480480
if (__do_binderfs_test(_metadata))
481-
XFAIL(return, "The Android binderfs filesystem is not available");
481+
SKIP(return, "The Android binderfs filesystem is not available");
482482
}
483483

484484
TEST(binderfs_test_unprivileged)
@@ -511,7 +511,7 @@ TEST(binderfs_test_unprivileged)
511511
ret = wait_for_pid(pid);
512512
if (ret) {
513513
if (ret == 2)
514-
XFAIL(return, "The Android binderfs filesystem is not available");
514+
SKIP(return, "The Android binderfs filesystem is not available");
515515
ASSERT_EQ(ret, 0) {
516516
TH_LOG("wait_for_pid() failed");
517517
}

0 commit comments

Comments
 (0)