diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-03-26 00:52:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-26 00:52:54 +0000 |
| commit | a1f8a8b9c00e4e62c74601ae8ab3b5ea534601ea (patch) | |
| tree | a645219bb1b58bd804b315f969ffa39ba2a3d6a3 | |
| parent | 609d8fab752b6d9287cac26476eea4f26b963815 (diff) | |
| parent | 58e9ca256ae4c260ef0406693b21de1a1f2eaa0f (diff) | |
| download | linux-kselftest-a1f8a8b9c00e4e62c74601ae8ab3b5ea534601ea.tar.gz | |
Merge "Revert "selftests: binderfs skip when syscall unavailable"" am: 58e9ca256a
Original change: https://android-review.googlesource.com/c/platform/external/linux-kselftest/+/2043252
Change-Id: I643e73b0045de03a961b2198fedab8d169759991
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(); |