diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-04-30 23:21:23 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-04-30 23:21:23 +0000 |
commit | 8ff5b338a8ffe8c74a85fefe214edd89ae4cf908 (patch) | |
tree | 78a5f87e4eae53aa5065387faddde707b00e8b28 | |
parent | b06ae42ca32a008e0683a4d6f9cf387003cad8af (diff) | |
parent | ddf2f2cbda9be180a8a4fcac6a9a3cda6526734b (diff) | |
download | netd-sdk-release.tar.gz |
Snap for 11785460 from ddf2f2cbda9be180a8a4fcac6a9a3cda6526734b to sdk-releasesdk-release
Change-Id: Ia80448db63977ca032218382c9f0afe172469e5a
-rw-r--r-- | tests/kernel_test.cpp | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/tests/kernel_test.cpp b/tests/kernel_test.cpp index 7902c47c..c2d74550 100644 --- a/tests/kernel_test.cpp +++ b/tests/kernel_test.cpp @@ -108,19 +108,8 @@ TEST(KernelTest, TestKernel419) { ASSERT_TRUE(bpf::isAtLeastKernelVersion(4, 19, 0)); } -static bool isKernel(unsigned major, unsigned minor) { - return bpf::isAtLeastKernelVersion(major, minor, 0) - && !bpf::isAtLeastKernelVersion(major, minor + 1, 0); -} - TEST(KernelTest, TestIsLTS) { - ASSERT_TRUE( - isKernel(4, 19) || - isKernel(5, 4) || - isKernel(5, 10) || - isKernel(5, 15) || - isKernel(6, 1) || - isKernel(6, 6)); + ASSERT_TRUE(bpf::isLtsKernel()); } static bool isGSI() { @@ -130,7 +119,7 @@ static bool isGSI() { #define ifIsKernelThenMinLTS(major, minor, sub) do { \ if (isGSI()) GTEST_SKIP() << "Test is meaningless on GSI."; \ - if (!isKernel((major), (minor))) GTEST_SKIP() << "Not for this kernel major/minor version."; \ + if (!bpf::isKernelVersion((major), (minor))) GTEST_SKIP() << "Not for this LTS ver."; \ ASSERT_TRUE(bpf::isAtLeastKernelVersion((major), (minor), (sub))); \ } while (0) |