Snap for 11734008 from 8a065645ab1fec04852b4e89600038a0f36faf31 to android14-tests-release

Change-Id: I2eb2fe6632d32bc4ae4a6fefc9056bd5d5c306c3

tests/boot_tests.cpp

diff --git a/tests/boot_tests.cpp b/tests/boot_tests.cpp
index 6264843..9d5907c 100644
--- a/tests/boot_tests.cpp
+++ b/tests/boot_tests.cpp
@@ -109,10 +109,12 @@
 
         struct statfs64 fs;
         ASSERT_GE(statfs64(path.c_str(), &fs), 0) << path;
-        ASSERT_EQ(fs.f_type, F2FS_SUPER_MAGIC);
+        ASSERT_TRUE(fs.f_type == F2FS_SUPER_MAGIC || fs.f_type == EXT4_SUPER_MAGIC)
+                << "Unexpected filesystem type: " << fs.f_type;
 
         auto entry = GetEntryForMountPoint(&fstab, mount_point);
         ASSERT_NE(entry, nullptr);
-        ASSERT_EQ(entry->fs_type, "f2fs");
+        ASSERT_TRUE(entry->fs_type == "f2fs" || entry->fs_type == "ext4")
+                << "Unexpected filesystem type: " << entry->fs_type;
     }
 }