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

Merge "libsnapshot_test: hardcode alignment."

Browse source
This commit is contained in:
Yifan Hong 2020-06-15 22:29:34 +00:00 • committed by Gerrit Code Review
commit 83c23a0650
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
fs_mgr/libsnapshot/test_helpers.cpp
View file

@ -52,10 +52,19 @@ android::base::unique_fd TestPartitionOpener::Open(const std::string& partition_
bool TestPartitionOpener::GetInfo(const std::string& partition_name, bool TestPartitionOpener::GetInfo(const std::string& partition_name,
android::fs_mgr::BlockDeviceInfo* info) const { android::fs_mgr::BlockDeviceInfo* info) const {
if (partition_name == "super") { if (partition_name != "super") {
return PartitionOpener::GetInfo(fake_super_path_, info); return PartitionOpener::GetInfo(partition_name, info);
} }
return PartitionOpener::GetInfo(partition_name, info);
if (PartitionOpener::GetInfo(fake_super_path_, info)) {
// SnapshotUpdateTest uses a relatively small super partition, which requires a small
// alignment and 0 offset to work. For the purpose of this test, hardcode the alignment
// and offset. This test isn't about testing liblp or libdm.
info->alignment_offset = 0;
info->alignment = std::min<uint32_t>(info->alignment, static_cast<uint32_t>(128_KiB));
return true;
}
return false;
} }
std::string TestPartitionOpener::GetDeviceString(const std::string& partition_name) const { std::string TestPartitionOpener::GetDeviceString(const std::string& partition_name) const {