diff options
| author | David Anderson <dvander@google.com> | 2022-07-19 10:18:34 -0700 |
|---|---|---|
| committer | Hung-ying Tyan <tyanh@google.com> | 2022-09-21 10:22:39 +0000 |
| commit | ce70d918faced63f1f672d794aca17aaba189747 (patch) | |
| tree | 2ec2de9d47031c9edc4cff6058aecea3a4e53227 | |
| parent | 29aee2dd12646005c0231259c4718d1bbe58fbfe (diff) | |
| download | kernel-ce70d918faced63f1f672d794aca17aaba189747.tar.gz | |
Fix metadata_test to conform with VTS requirements.
/metadata can be ext4 or f2fs, which this test does not reflect.
Bug: 235179552
Bug: 245054536
Test: vts
Change-Id: I586388f1056057308f43d977375cfa9240e285da
Merged-In: I586388f1056057308f43d977375cfa9240e285da
(cherry picked from commit 0cb921fcc4eea3e8e00e57de9ec91fba002f3850)
| -rw-r--r-- | virtual_ab/metadata_test.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/virtual_ab/metadata_test.cpp b/virtual_ab/metadata_test.cpp index 1e1190bc..1264b276 100644 --- a/virtual_ab/metadata_test.cpp +++ b/virtual_ab/metadata_test.cpp @@ -23,16 +23,20 @@ static constexpr const char kMetadata[] = "/metadata"; -TEST(Metadata, IsExt4) { +TEST(Metadata, Filesystem) { struct statfs buf; ASSERT_EQ(0, statfs(kMetadata, &buf)) << "Cannot statfs " << kMetadata << ": " << strerror(errno); int vsr_level = android::base::GetIntProperty("ro.vendor.api_level", -1); + + bool is_ext4 = (buf.f_type == EXT4_SUPER_MAGIC); + bool is_f2fs = (buf.f_type == F2FS_SUPER_MAGIC); if (vsr_level < __ANDROID_API_T__) { - ASSERT_EQ(EXT4_SUPER_MAGIC, buf.f_type); + ASSERT_TRUE(is_ext4) << "Filesystem magic: " << std::to_string(buf.f_type); } else { - ASSERT_EQ(F2FS_SUPER_MAGIC, buf.f_type); + ASSERT_TRUE(is_ext4 || is_f2fs) + << "Filesystem magic: " << std::to_string(buf.f_type); } } |