diff options
| author | David Anderson <dvander@google.com> | 2022-05-25 13:38:37 -0700 |
|---|---|---|
| committer | David Anderson <dvander@google.com> | 2022-05-27 00:21:30 +0000 |
| commit | 0895d63952a6c54cd413c925580c544be27b83c5 (patch) | |
| tree | 2024a0d2a4ccd17dfc739bdbb2d3fafc22f050b1 | |
| parent | 2cf162748fef8fa077e582f9f25eef45884ce9b8 (diff) | |
| download | core-0895d63952a6c54cd413c925580c544be27b83c5.tar.gz | |
Relax filesystem requirements in vts_fs_test.
Bug: 233926292
Test: vts_fs_test
Change-Id: I9665acebd6ebfde14e0cd76e8044e7ced9ffbeb3
Ignore-AOSP-First: cherry-pick from AOSP
| -rw-r--r-- | fs_mgr/tests/vts_fs_test.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/fs_mgr/tests/vts_fs_test.cpp b/fs_mgr/tests/vts_fs_test.cpp index b5fac53af..8c49e4a0f 100644 --- a/fs_mgr/tests/vts_fs_test.cpp +++ b/fs_mgr/tests/vts_fs_test.cpp @@ -94,7 +94,13 @@ TEST(fs, PartitionTypes) { } if (entry.flags & MS_RDONLY) { - EXPECT_EQ(entry.fs_type, "erofs") << entry.mount_point; + std::vector<std::string> allowed = {"erofs", "ext4"}; + if (vsr_level == __ANDROID_API_T__) { + allowed.emplace_back("f2fs"); + } + + EXPECT_NE(std::find(allowed.begin(), allowed.end(), entry.fs_type), allowed.end()) + << entry.mount_point; } else { EXPECT_NE(entry.fs_type, "ext4") << entry.mount_point; } |