diff options
| author | Edward Liaw <edliaw@google.com> | 2022-03-25 23:34:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-25 23:34:07 +0000 |
| commit | d4112ea7bc0d05ceb244415d298483fcad9621dc (patch) | |
| tree | 2dadc0063696c35547227b8f1b81fb0920fce356 | |
| parent | 6f83990234355ef495e5dde0108c105a570eae39 (diff) | |
| parent | 3efdbf9ffbcf81a1be6dddea5dc29cad91e34ba2 (diff) | |
| download | linux-kselftest-d4112ea7bc0d05ceb244415d298483fcad9621dc.tar.gz | |
selftests: binderfs skip when syscall unavailable am: 37ebb766e9 am: 0e2524e459 am: 3efdbf9ffb
Original change: https://android-review.googlesource.com/c/platform/external/linux-kselftest/+/2041083
Change-Id: Idc07366a0f4ff0bdaee1420e4f35d9f5bc801e73
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, 34 insertions, 2 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 new file mode 100644 index 000000000000..30e99b90cac3 --- /dev/null +++ b/android/patches/0024-selftests-binderfs-skip-when-syscall-unavailable.patch @@ -0,0 +1,33 @@ +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 4465b4f6a81a..e10f2371921a 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(); |