Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

selftests: binderfs: use SKIP instead of XFAIL

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

Fixes: 9847d24af95c ("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>

authored by

Tommi Rantala and committed by
Shuah Khan
7d764b68 afba8b0a

+4 -4
+4 -4
tools/testing/selftests/filesystems/binderfs/binderfs_test.c
··· 74 74 ret = mount(NULL, binderfs_mntpt, "binder", 0, 0); 75 75 EXPECT_EQ(ret, 0) { 76 76 if (errno == ENODEV) 77 - XFAIL(goto out, "binderfs missing"); 77 + SKIP(goto out, "binderfs missing"); 78 78 TH_LOG("%s - Failed to mount binderfs", strerror(errno)); 79 79 goto rmdir; 80 80 } ··· 475 475 TEST(binderfs_test_privileged) 476 476 { 477 477 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"); 479 479 480 480 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"); 482 482 } 483 483 484 484 TEST(binderfs_test_unprivileged) ··· 511 511 ret = wait_for_pid(pid); 512 512 if (ret) { 513 513 if (ret == 2) 514 - XFAIL(return, "The Android binderfs filesystem is not available"); 514 + SKIP(return, "The Android binderfs filesystem is not available"); 515 515 ASSERT_EQ(ret, 0) { 516 516 TH_LOG("wait_for_pid() failed"); 517 517 }