commit f723ef3043b17c25eda308c9d14bff66232f5f3c
author David Anderson <dvander@google.com> Tue Jan 24 23:51:08 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 24 23:51:08 2023 +0000
tree c1a14b5b604524fc8ee0a788ec24d33567eac780
parent 1e53806ad984af26c10aefb07aa6d4df0327df61
parent 717b97a2010e517de9830dd733930dd86f434907

Merge "libdm: Fix failing test on older kernels."

fs_mgr/libdm/dm_test.cpp

diff --git a/fs_mgr/libdm/dm_test.cpp b/fs_mgr/libdm/dm_test.cpp
index 4448d35..788cf51 100644
--- a/fs_mgr/libdm/dm_test.cpp
+++ b/fs_mgr/libdm/dm_test.cpp
@@ -19,6 +19,7 @@
 #include <stdio.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
+#include <sys/utsname.h>
 #include <time.h>
 #include <unistd.h>
 
@@ -692,7 +693,17 @@
 }
 
 TEST(libdm, UeventAfterLoadTable) {
-    static const char* kDeviceName = "libmd-test-uevent-load-table";
+    static const char* kDeviceName = "libdm-test-uevent-load-table";
+
+    struct utsname u;
+    ASSERT_EQ(uname(&u), 0);
+
+    unsigned int major, minor;
+    ASSERT_EQ(sscanf(u.release, "%u.%u", &major, &minor), 2);
+
+    if (major < 5 || (major == 5 && minor < 15)) {
+        GTEST_SKIP() << "Skipping test on kernel < 5.15";
+    }
 
     DeviceMapper& dm = DeviceMapper::Instance();
     ASSERT_TRUE(dm.CreateEmptyDevice(kDeviceName));