commit 07d138926feeaa4be572a031943ea2cd7de471b0
author Maciej Żenczykowski <maze@google.com> Fri Mar 01 20:47:07 2024 -0800
committer Maciej Żenczykowski <maze@google.com> Sun Mar 03 22:41:00 2024 -0800
tree 3ee22d2a3289ff2af327f5a64457fe8b9713a400
parent 653bbf03b8429620f457e062d3a3c156fdcad5f2

kernel_test: use GTEST_SKIP to show IGNORED

On cf: 6.1.68-android14-11-ga7f647f49daf-ab11484633

x86_64 netd_integration_test
----------------------------
netd_integration_test64 (13 Tests)
[1/13] KernelTest#TestRateLimitingSupport: PASSED (11ms)
[2/13] KernelTest#TestBpfJitAlwaysOn: PASSED (0ms)
[3/13] KernelTest#TestKernel64Bit: PASSED (0ms)
[4/13] KernelTest#TestX86Kernel64Bit: PASSED (0ms)
[5/13] KernelTest#TestKernel419: PASSED (0ms)
[6/13] KernelTest#TestIsLTS: PASSED (0ms)
[7/13] KernelTest#TestMinRequiredLTS_4_19: IGNORED (0ms)
[8/13] KernelTest#TestMinRequiredLTS_5_4: IGNORED (0ms)
[9/13] KernelTest#TestMinRequiredLTS_5_10: IGNORED (0ms)
[10/13] KernelTest#TestMinRequiredLTS_5_15: IGNORED (0ms)
[11/13] KernelTest#TestMinRequiredLTS_6_1: PASSED (0ms)
[12/13] KernelTest#TestMinRequiredLTS_6_6: IGNORED (0ms)
[13/13] KernelTest#TestSupportsCommonUsbEthernetDongles: PASSED (0ms)

Summary (Test executed with 1 devices.)
-------
x86_64 netd_integration_test: Passed: 8, Failed: 0, Ignored: 5, Assumption Failed: 0

All tests passed!

Test: atest netd_integration_test:KernelTest
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I5520781dfa8fccd8b17cbf635565ef3491e4a003

tests/kernel_test.cpp

diff --git a/tests/kernel_test.cpp b/tests/kernel_test.cpp
index b42b7aa..14950d6 100644
--- a/tests/kernel_test.cpp
+++ b/tests/kernel_test.cpp
@@ -118,34 +118,17 @@
         isKernel(6, 6));
 }
 
-static bool ifIsKernelThenMinLTS(unsigned major, unsigned minor, unsigned sub) {
-    if (!isKernel(major, minor)) return true;
-    return bpf::isAtLeastKernelVersion(major, minor, sub);
-}
+#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) {
-    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));
-}
+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;