diff options
author | Maciej Żenczykowski <maze@google.com> | 2024-03-04 09:02:21 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-03-04 09:02:21 +0000 |
commit | 5cd4f4001529d0e895881eae73b1e0fdfdd0a9df (patch) | |
tree | 3ee22d2a3289ff2af327f5a64457fe8b9713a400 | |
parent | 186b618e29e6287148957381299fd7c02eac92f1 (diff) | |
parent | 07d138926feeaa4be572a031943ea2cd7de471b0 (diff) | |
download | netd-5cd4f4001529d0e895881eae73b1e0fdfdd0a9df.tar.gz |
kernel_test: use GTEST_SKIP to show IGNORED am: 07d138926f
Original change: https://android-review.googlesource.com/c/platform/system/netd/+/2986055
Change-Id: Icf908dde3190834f3d5ba06672344e598c0beae8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | tests/kernel_test.cpp | 39 |
1 files changed, 11 insertions, 28 deletions
diff --git a/tests/kernel_test.cpp b/tests/kernel_test.cpp index b42b7aa0..14950d62 100644 --- a/tests/kernel_test.cpp +++ b/tests/kernel_test.cpp @@ -118,34 +118,17 @@ TEST(KernelTest, TestIsLTS) { isKernel(6, 6)); } -static bool ifIsKernelThenMinLTS(unsigned major, unsigned minor, unsigned sub) { - if (!isKernel(major, minor)) return true; - return bpf::isAtLeastKernelVersion(major, minor, sub); -} - -TEST(KernelTest, TestMinRequiredLTS_4_19) { - ASSERT_TRUE(ifIsKernelThenMinLTS(4, 19, 236)); -} - -TEST(KernelTest, TestMinRequiredLTS_5_4) { - ASSERT_TRUE(ifIsKernelThenMinLTS(5, 4, 186)); -} - -TEST(KernelTest, TestMinRequiredLTS_5_10) { - ASSERT_TRUE(ifIsKernelThenMinLTS(5, 10, 199)); -} - -TEST(KernelTest, TestMinRequiredLTS_5_15) { - ASSERT_TRUE(ifIsKernelThenMinLTS(5, 15, 136)); -} - -TEST(KernelTest, TestMinRequiredLTS_6_1) { - ASSERT_TRUE(ifIsKernelThenMinLTS(6, 1, 57)); -} - -TEST(KernelTest, TestMinRequiredLTS_6_6) { - ASSERT_TRUE(ifIsKernelThenMinLTS(6, 6, 0)); -} +#define ifIsKernelThenMinLTS(major, minor, sub) do { \ + if (!isKernel((major), (minor))) GTEST_SKIP() << "Not for this kernel major/minor version."; \ + ASSERT_TRUE(bpf::isAtLeastKernelVersion((major), (minor), (sub))); \ +} while (0) + +TEST(KernelTest, TestMinRequiredLTS_4_19) { ifIsKernelThenMinLTS(4, 19, 236); } +TEST(KernelTest, TestMinRequiredLTS_5_4) { ifIsKernelThenMinLTS(5, 4, 186); } +TEST(KernelTest, TestMinRequiredLTS_5_10) { ifIsKernelThenMinLTS(5, 10, 199); } +TEST(KernelTest, TestMinRequiredLTS_5_15) { ifIsKernelThenMinLTS(5, 15, 136); } +TEST(KernelTest, TestMinRequiredLTS_6_1) { ifIsKernelThenMinLTS(6, 1, 57); } +TEST(KernelTest, TestMinRequiredLTS_6_6) { ifIsKernelThenMinLTS(6, 6, 0); } TEST(KernelTest, TestSupportsCommonUsbEthernetDongles) { KernelConfigVerifier configVerifier; |