openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "libsnapshot_test: hardcode alignment." am: 83c23a0650 am: f32197f28a 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1330937

Change-Id: Id0d5fda3a536c8f826e815f1d00ffc0e09ddf411
This commit is contained in:
Yifan Hong 2020-06-15 22:56:55 +00:00 committed by Automerger Merge Worker
parent 055be4afa2 f32197f28a
commit d9cf12c089
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,
android::fs_mgr::BlockDeviceInfo* info) const {
if (partition_name == "super") {
return PartitionOpener::GetInfo(fake_super_path_, info);
if (partition_name != "super") {
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 {