aboutsummaryrefslogtreecommitdiffstats
path: root/tools/testing/selftests/filesystems/binderfs/binderfs_test.c
diff options
context:
space:
mode:
authorTommi Rantala <tommi.t.rantala@nokia.com>2020-10-08 15:26:33 +0300
committerShuah Khan <skhan@linuxfoundation.org>2020-11-05 10:08:15 -0700
commit7d764b685ee1bc73a9fa2b6cb4d42fa72b943145 (patch)
treebcd1f820822e5c0cafa2daeca95cf3d6933ed63c /tools/testing/selftests/filesystems/binderfs/binderfs_test.c
parentselftests: clone3: use SKIP instead of XFAIL (diff)
downloadlinux-dev-7d764b685ee1bc73a9fa2b6cb4d42fa72b943145.tar.xz
linux-dev-7d764b685ee1bc73a9fa2b6cb4d42fa72b943145.zip
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>
Diffstat (limited to '')
-rw-r--r--tools/testing/selftests/filesystems/binderfs/binderfs_test.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/testing/selftests/filesystems/binderfs/binderfs_test.c b/tools/testing/selftests/filesystems/binderfs/binderfs_test.c
index 1d27f52c61e6..477cbb042f5b 100644
--- a/tools/testing/selftests/filesystems/binderfs/binderfs_test.c
+++ b/tools/testing/selftests/filesystems/binderfs/binderfs_test.c
@@ -74,7 +74,7 @@ static int __do_binderfs_test(struct __test_metadata *_metadata)
ret = mount(NULL, binderfs_mntpt, "binder", 0, 0);
EXPECT_EQ(ret, 0) {
if (errno == ENODEV)
- XFAIL(goto out, "binderfs missing");
+ SKIP(goto out, "binderfs missing");
TH_LOG("%s - Failed to mount binderfs", strerror(errno));
goto rmdir;
}
@@ -475,10 +475,10 @@ TEST(binderfs_stress)
TEST(binderfs_test_privileged)
{
if (geteuid() != 0)
- XFAIL(return, "Tests are not run as root. Skipping privileged tests");
+ SKIP(return, "Tests are not run as root. Skipping privileged tests");
if (__do_binderfs_test(_metadata))
- XFAIL(return, "The Android binderfs filesystem is not available");
+ SKIP(return, "The Android binderfs filesystem is not available");
}
TEST(binderfs_test_unprivileged)
@@ -511,7 +511,7 @@ TEST(binderfs_test_unprivileged)
ret = wait_for_pid(pid);
if (ret) {
if (ret == 2)
- XFAIL(return, "The Android binderfs filesystem is not available");
+ SKIP(return, "The Android binderfs filesystem is not available");
ASSERT_EQ(ret, 0) {
TH_LOG("wait_for_pid() failed");
}