Snap for 11526283 from a4fd5ec1b6031037f94ee50b69ded1340f925de9 to 24Q2-releaseandroid-14.0.0_r50android14-qpr3-release

Change-Id: I443597a0a44bb762fbdac9181a9c443e4dcc807a

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;