diff options
| author | David Anderson <dvander@google.com> | 2024-04-02 17:16:51 -0700 |
|---|---|---|
| committer | Hung-ying Tyan <tyanh@google.com> | 2024-04-18 07:27:15 +0000 |
| commit | 59f2b11c482a41130bc5c41ace5a0ffe3aa4b382 (patch) | |
| tree | 10b119105569d017abd8eb0f84689687440235e0 | |
| parent | a3e0d50468f66c4b9276129da056ee232701cce9 (diff) | |
| download | gsid-59f2b11c482a41130bc5c41ace5a0ffe3aa4b382.tar.gz | |
Align /data partition rules with vts_fs_test.android13-tests-dev
Bug: 313335353
Bug: 333630278
Test: gsi_boot_test
Change-Id: Iafaa370b732457bf1ba1dcabfb63c2490ad1f176
(cherry picked from commit b53eeb613315305256e24fe9d69571fae44157c7)
Merged-In: Iafaa370b732457bf1ba1dcabfb63c2490ad1f176
| -rw-r--r-- | tests/boot_tests.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
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 @@ TEST(MetadataPartition, FsType) { 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; } } |