summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Żenczykowski <maze@google.com>2024-04-25 14:30:22 -0700
committerMaciej Żenczykowski <maze@google.com>2024-04-25 23:27:40 +0000
commitddf2f2cbda9be180a8a4fcac6a9a3cda6526734b (patch)
tree78a5f87e4eae53aa5065387faddde707b00e8b28
parent4fafa6f6918cd8004357acd33ebe66523fc9f9fb (diff)
downloadnetd-master.tar.gz
kernel_test: use the new helpersHEADmastermain
Test: TreeHugger Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: If3efe7e5dc8907a524af35515551393d37f251b2
-rw-r--r--tests/kernel_test.cpp15
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)