diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-03-26 04:14:44 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-26 04:14:44 +0000 |
commit | e9ebf262fc0229aefd9f2366fba8870c2b17fdf5 (patch) | |
tree | df1ccb26decb5dd8062ef10828afbe499f3fe3b6 | |
parent | 198a8658501b0a47edc731d255c27c006e033b2d (diff) | |
parent | 5db1b0bfbf2004030d2b03805490e0f4518881f6 (diff) | |
download | linux-kselftest-android13-qpr3-c-s10-release.tar.gz |
Merge "Revert "Skip binderfs tests for kernels without support"" am: 70500fd1b2 am: be6c477fb0 am: 5db1b0bfbft_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android-vts-13.0_r3android-vts-13.0_r2android-t-qpr3-beta-3-gplandroid-t-qpr3-beta-1-gplandroid-t-qpr2-beta-3-gplandroid-t-qpr2-beta-2-gplandroid-cts-13.0_r3android-cts-13.0_r2android-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-frc-odp-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-release
Original change: https://android-review.googlesource.com/c/platform/external/linux-kselftest/+/2043253
Change-Id: Ie43bd0d2d136989b419d8389ad466cb592da6f48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | android/patches/0022-selftests-binderfs-skip-tests-for-unsupported-kernel.patch | 65 | ||||
-rw-r--r-- | tools/testing/selftests/filesystems/binderfs/binderfs_test.c | 28 |
2 files changed, 0 insertions, 93 deletions
diff --git a/android/patches/0022-selftests-binderfs-skip-tests-for-unsupported-kernel.patch b/android/patches/0022-selftests-binderfs-skip-tests-for-unsupported-kernel.patch deleted file mode 100644 index 7b1e1a1c32bc..000000000000 --- a/android/patches/0022-selftests-binderfs-skip-tests-for-unsupported-kernel.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 57b74c1b318625057398ccbe479a157507488d8c Mon Sep 17 00:00:00 2001 -From: Carlos Llamas <cmllamas@google.com> -Date: Tue, 14 Dec 2021 05:58:48 +0000 -Subject: [PATCH] selftests/binderfs: skip tests for unsupported kernels - -Binderfs was first introduced in Linux 5.0 release, so we need to skip -these tests for older kernels. Also, we force a successful exit as the -current framework doesn't handle KSFT_SKIP return codes. - -Signed-off-by: Carlos Llamas <cmllamas@google.com> ---- - .../filesystems/binderfs/binderfs_test.c | 28 +++++++++++++++++++ - 1 file changed, 28 insertions(+) - -diff --git a/tools/testing/selftests/filesystems/binderfs/binderfs_test.c b/tools/testing/selftests/filesystems/binderfs/binderfs_test.c -index 8c2ed962e1c7..be5a8f446066 100644 ---- a/tools/testing/selftests/filesystems/binderfs/binderfs_test.c -+++ b/tools/testing/selftests/filesystems/binderfs/binderfs_test.c -@@ -12,6 +12,7 @@ - #include <sys/mount.h> - #include <sys/stat.h> - #include <sys/types.h> -+#include <sys/utsname.h> - #include <unistd.h> - #include <linux/android/binder.h> - #include <linux/android/binderfs.h> -@@ -267,8 +268,35 @@ static void binderfs_test_unprivileged() - __do_binderfs_test(); - } - -+/* binderfs first introduced in Linux 5.0 */ -+bool binderfs_supported(void) -+{ -+ const int min_kernel_version = 5; -+ struct utsname utsname; -+ int ret, version; -+ -+ ret = uname(&utsname); -+ if (ret) -+ ksft_exit_fail_msg("%s - Failed to get kernel version\n", -+ strerror(errno)); -+ -+ ret = sscanf(utsname.release, "%d.", &version); -+ if (ret != 1) -+ ksft_exit_fail_msg("%s - Failed to parse uname: %s\n", -+ strerror(errno), utsname.release); -+ -+ return version >= min_kernel_version? true: false; -+} -+ -+ - 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(); -+ } -+ - binderfs_test_privileged(); - binderfs_test_unprivileged(); - ksft_exit_pass(); --- -2.34.1.173.g76aa8bc2d0-goog - diff --git a/tools/testing/selftests/filesystems/binderfs/binderfs_test.c b/tools/testing/selftests/filesystems/binderfs/binderfs_test.c index 4465b4f6a81a..397bf265ba97 100644 --- a/tools/testing/selftests/filesystems/binderfs/binderfs_test.c +++ b/tools/testing/selftests/filesystems/binderfs/binderfs_test.c @@ -12,7 +12,6 @@ #include <sys/mount.h> #include <sys/stat.h> #include <sys/types.h> -#include <sys/utsname.h> #include <unistd.h> #include <linux/android/binder.h> #include <linux/android/binderfs.h> @@ -274,35 +273,8 @@ static void binderfs_test_unprivileged() __do_binderfs_test(); } -/* binderfs first introduced in Linux 5.0 */ -bool binderfs_supported(void) -{ - const int min_kernel_version = 5; - struct utsname utsname; - int ret, version; - - ret = uname(&utsname); - if (ret) - ksft_exit_fail_msg("%s - Failed to get kernel version\n", - strerror(errno)); - - ret = sscanf(utsname.release, "%d.", &version); - if (ret != 1) - ksft_exit_fail_msg("%s - Failed to parse uname: %s\n", - strerror(errno), utsname.release); - - return version >= min_kernel_version? true: false; -} - - 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(); - } - binderfs_test_privileged(); binderfs_test_unprivileged(); ksft_exit_pass(); |