ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Relax filesystem requirements in vts_fs_test." into tm-dev

Browse source
This commit is contained in:
David Anderson 2022-05-27 04:55:28 +00:00 • committed by Android (Google) Code Review
commit 0d3b8d557f
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
fs_mgr/tests/vts_fs_test.cpp
View file

@ -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;
}