diff options
| author | Maciej Żenczykowski <maze@google.com> | 2024-02-17 04:14:16 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-17 04:14:16 +0000 |
| commit | 34ba42b43f2410db04284878859df9a74396e77d (patch) | |
| tree | 5645818a1cb37f89618a9d813b22e843f08e5672 | |
| parent | 6e64678409c4257005f35e31cbd5787fa1ad5bb5 (diff) | |
| parent | b75cc34c0c83f05ca8aed91e17732a0a06afaf34 (diff) | |
| download | netd-34ba42b43f2410db04284878859df9a74396e77d.tar.gz | |
VTS: kernel_test: require x86 kernels to be 64-bit am: b75cc34c0c
Original change: https://android-review.googlesource.com/c/platform/system/netd/+/2966803
Change-Id: I8b2884f36579bae93718f40d44a6eda06cb44917
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | tests/kernel_test.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/kernel_test.cpp b/tests/kernel_test.cpp index 5a96c957..6de12ab5 100644 --- a/tests/kernel_test.cpp +++ b/tests/kernel_test.cpp @@ -91,6 +91,13 @@ TEST(KernelTest, TestKernel64Bit) { ASSERT_TRUE(bpf::isKernel64Bit()); } +// Android V requires x86 kernels to be 64-bit, as among other things +// 32-bit x86 kernels have subtly different structure layouts for XFRM +TEST(KernelTest, TestX86Kernel64Bit) { + if (!bpf::isX86()) GTEST_SKIP() << "Exempt on non-x86 architecture."; + ASSERT_TRUE(bpf::isKernel64Bit()); +} + // Android V requires 4.19+ TEST(KernelTest, TestKernel419) { ASSERT_TRUE(bpf::isAtLeastKernelVersion(4, 19, 0)); |