Commit 7d764b68 authored by Tommi Rantala's avatar Tommi Rantala Committed by Shuah Khan
Browse files

selftests: binderfs: use SKIP instead of XFAIL 



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

Fixes: 9847d24a ("selftests/harness: Refactor XFAIL into SKIP")
Signed-off-by: default avatarTommi Rantala <tommi.t.rantala@nokia.com>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Acked-by: default avatarChristian Brauner <christian.brauner@ubuntu.com>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent afba8b0a

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

+4 −4
Original line number Diff line number Diff line
@@ -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");

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE