diff options
author | David Anderson <dvander@google.com> | 2023-06-08 16:15:24 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-06-08 16:15:24 +0000 |
commit | c941f43b9aafca2943ce10028943b91ae98a8ed2 (patch) | |
tree | 86c4e43183b00a7ddb1edd49e23339aeecd8ffdb | |
parent | 4c378e2f9dc048aa99ad1b1f1106b6d6f2edbcd6 (diff) | |
parent | 7f5512dcd0a8576039983810c6234c52bdd8514a (diff) | |
download | core-c941f43b9aafca2943ce10028943b91ae98a8ed2.tar.gz |
Merge "vts_fs_test: Relax filesystem constraints for fixed partitions." into udc-dev am: 7f5512dcd0
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/23597911
Change-Id: I29c1d783dfdea4838cf235b7a3394ce105d2f880
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | fs_mgr/tests/vts_fs_test.cpp | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/fs_mgr/tests/vts_fs_test.cpp b/fs_mgr/tests/vts_fs_test.cpp index bb2ceb9b5..4d771fa04 100644 --- a/fs_mgr/tests/vts_fs_test.cpp +++ b/fs_mgr/tests/vts_fs_test.cpp @@ -55,6 +55,21 @@ TEST(fs, ErofsSupported) { } TEST(fs, PartitionTypes) { + // Requirements only apply to Android 13+, 5.10+ devices. + int vsr_level = GetVsrLevel(); + if (vsr_level < __ANDROID_API_T__) { + GTEST_SKIP(); + } + + struct utsname uts; + ASSERT_EQ(uname(&uts), 0); + + unsigned int major, minor; + ASSERT_EQ(sscanf(uts.release, "%u.%u", &major, &minor), 2); + if (major < 5 || (major == 5 && minor < 10)) { + GTEST_SKIP(); + } + android::fs_mgr::Fstab fstab; ASSERT_TRUE(android::fs_mgr::ReadFstabFromFile("/proc/mounts", &fstab)); @@ -64,12 +79,7 @@ TEST(fs, PartitionTypes) { ASSERT_TRUE(android::base::Readlink("/dev/block/by-name/super", &super_bdev)); ASSERT_TRUE(android::base::Readlink("/dev/block/by-name/userdata", &userdata_bdev)); - int vsr_level = GetVsrLevel(); - - std::vector<std::string> must_be_f2fs; - if (vsr_level >= __ANDROID_API_T__) { - must_be_f2fs.emplace_back("/data"); - } + std::vector<std::string> must_be_f2fs = {"/data"}; if (vsr_level >= __ANDROID_API_U__) { must_be_f2fs.emplace_back("/metadata"); } @@ -98,17 +108,13 @@ TEST(fs, PartitionTypes) { continue; } - if (vsr_level < __ANDROID_API_T__) { - continue; - } - if (vsr_level == __ANDROID_API_T__ && parent_bdev != super_bdev) { - // Only check for dynamic partitions at this VSR level. - continue; - } - if (entry.flags & MS_RDONLY) { - std::vector<std::string> allowed = {"erofs", "ext4", "f2fs"}; + if (parent_bdev != super_bdev) { + // Ignore non-AOSP partitions (eg anything outside of super). + continue; + } + 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 { |