diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-03-26 01:37:18 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-26 01:37:18 +0000 |
commit | 6cce8820b2e18c2410227521c569d741622e31d8 (patch) | |
tree | a645219bb1b58bd804b315f969ffa39ba2a3d6a3 | |
parent | 352f45c2af295475bc9898fd78c26a90e0f4f1ba (diff) | |
parent | 198a8658501b0a47edc731d255c27c006e033b2d (diff) | |
download | linux-kselftest-6cce8820b2e18c2410227521c569d741622e31d8.tar.gz |
Merge "Revert "selftests: binderfs skip when syscall unavailable"" am: 58e9ca256a am: a1f8a8b9c0 am: 941e4d746f am: 198a865850
Original change: https://android-review.googlesource.com/c/platform/external/linux-kselftest/+/2043252
Change-Id: Iee4d1446ffb02e9a9c77076f3b205c84ae6f612d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | android/patches/0024-selftests-binderfs-skip-when-syscall-unavailable.patch | 33 | ||||
-rw-r--r-- | tools/testing/selftests/filesystems/binderfs/binderfs_test.c | 3 |
2 files changed, 2 insertions, 34 deletions
diff --git a/android/patches/0024-selftests-binderfs-skip-when-syscall-unavailable.patch b/android/patches/0024-selftests-binderfs-skip-when-syscall-unavailable.patch deleted file mode 100644 index 30e99b90cac3..000000000000 --- a/android/patches/0024-selftests-binderfs-skip-when-syscall-unavailable.patch +++ /dev/null @@ -1,33 +0,0 @@ -From fb64f30a1f159fb3359baf547f1199f980abe5d0 Mon Sep 17 00:00:00 2001 -From: Edward Liaw <edliaw@google.com> -Date: Wed, 23 Mar 2022 23:21:21 +0000 -Subject: [PATCH] selftests: binderfs skip when syscall unavailable - -Change pass to skip when the binderfs syscall is not supported - -Bug: 207175332 -Bug: 208276189 -Test: atest vts_linux_kselftest_arm_64:binderfs_arm_64#binderfs_arm_64 -Change-Id: If28637c69c65b28bc68e6660f1df004efc436eb8 -Signed-off-by: Edward Liaw <edliaw@google.com> ---- - tools/testing/selftests/filesystems/binderfs/binderfs_test.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/tools/testing/selftests/filesystems/binderfs/binderfs_test.c b/tools/testing/selftests/filesystems/binderfs/binderfs_test.c -index 4465b4f..e10f237 100644 ---- a/tools/testing/selftests/filesystems/binderfs/binderfs_test.c -+++ b/tools/testing/selftests/filesystems/binderfs/binderfs_test.c -@@ -299,8 +299,7 @@ int main(int argc, char *argv[]) - { - /* Force success exit for older kernels */ - if (!binderfs_supported()) { -- ksft_print_msg("Skipping tests - binderfs not supported\n"); -- ksft_exit_pass(); -+ ksft_exit_skip("binderfs syscall not supported in this kernel\n"); - } - - binderfs_test_privileged(); --- -2.35.1.1021.g381101b075-goog - diff --git a/tools/testing/selftests/filesystems/binderfs/binderfs_test.c b/tools/testing/selftests/filesystems/binderfs/binderfs_test.c index e10f2371921a..4465b4f6a81a 100644 --- a/tools/testing/selftests/filesystems/binderfs/binderfs_test.c +++ b/tools/testing/selftests/filesystems/binderfs/binderfs_test.c @@ -299,7 +299,8 @@ int main(int argc, char *argv[]) { /* Force success exit for older kernels */ if (!binderfs_supported()) { - ksft_exit_skip("binderfs syscall not supported in this kernel\n"); + ksft_print_msg("Skipping tests - binderfs not supported\n"); + ksft_exit_pass(); } binderfs_test_privileged(); |