diff options
| author | David Anderson <dvander@google.com> | 2024-04-18 17:04:31 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-04-18 17:04:31 +0000 |
| commit | 8a065645ab1fec04852b4e89600038a0f36faf31 (patch) | |
| tree | 292aa2b26e6b365742ffa0dd0b650bb621f71b87 | |
| parent | 858059e4c10afd85ccd370034a7fb61f73375f2b (diff) | |
| parent | 59f2b11c482a41130bc5c41ace5a0ffe3aa4b382 (diff) | |
| download | gsid-android14-tests-dev.tar.gz | |
Align /data partition rules with vts_fs_test. am: 59f2b11c48android14-tests-dev
Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/3048275
Change-Id: Ibca17f9d2f53d991dbd6cb98ec87898cda1c718e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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; } } |