tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Update vts_fs_test to reflect VSR."

Browse source
This commit is contained in:
David Anderson 2022-12-15 19:17:03 +00:00 committed by Gerrit Code Review
commit 1c34ae8864
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
fs_mgr/tests/vts_fs_test.cpp
View file

@ -66,6 +66,14 @@ TEST(fs, PartitionTypes) {
int vsr_level = GetVsrLevel();
std::vector<std::string> must_be_f2fs;
if (vsr_level >= __ANDROID_API_T__) {
must_be_f2fs.emplace_back("/data");
}
if (vsr_level >= __ANDROID_API_U__) {
must_be_f2fs.emplace_back("/metadata");
}
for (const auto& entry : fstab) {
std::string parent_bdev = entry.blk_device;
while (true) {
@ -99,15 +107,15 @@ TEST(fs, PartitionTypes) {
}
if (entry.flags & MS_RDONLY) {
std::vector<std::string> allowed = {"erofs", "ext4"};
if (vsr_level == __ANDROID_API_T__) {
allowed.emplace_back("f2fs");
}
std::vector<std::string> allowed = {"erofs", "ext4", "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;
if (std::find(must_be_f2fs.begin(), must_be_f2fs.end(), entry.mount_point) !=
must_be_f2fs.end()) {
EXPECT_EQ(entry.fs_type, "f2fs") << entry.mount_point;
}
}
}
}