PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "applypatch: Dump patch info on mismatching patching result."

Browse Source 
am: d2c32b281b

Change-Id: Ib43606f5fcd9e238b16b70b6dd519bb38a780dd3
This commit is contained in:
Tao Bao
2018-04-19 14:43:48 -07:00
committed by android-build-merger
parent 11e31203a6 d2c32b281b
commit ea70fd7d1d
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
applypatch/applypatch.cpp
View File

@@ -652,7 +652,22 @@ static int GenerateTarget(const FileContents& source_file, const std::unique_ptr
uint8_t current_target_sha1[SHA_DIGEST_LENGTH]; uint8_t current_target_sha1[SHA_DIGEST_LENGTH];
SHA1_Final(current_target_sha1, &ctx); SHA1_Final(current_target_sha1, &ctx);
if (memcmp(current_target_sha1, target_sha1, SHA_DIGEST_LENGTH) != 0) { if (memcmp(current_target_sha1, target_sha1, SHA_DIGEST_LENGTH) != 0) {
printf("patch did not produce expected sha1\n"); printf("patch did not produce expected sha1 of %s\n", short_sha1(target_sha1).c_str());
printf("target size %zu sha1 %s\n", memory_sink_str.size(),
short_sha1(current_target_sha1).c_str());
printf("source size %zu sha1 %s\n", source_file.data.size(),
short_sha1(source_file.sha1).c_str());
uint8_t patch_digest[SHA_DIGEST_LENGTH];
SHA1(reinterpret_cast<const uint8_t*>(patch->data.data()), patch->data.size(), patch_digest);
printf("patch size %zu sha1 %s\n", patch->data.size(), short_sha1(patch_digest).c_str());
uint8_t bonus_digest[SHA_DIGEST_LENGTH];
SHA1(reinterpret_cast<const uint8_t*>(bonus_data->data.data()), bonus_data->data.size(),
bonus_digest);
printf("bonus size %zu sha1 %s\n", bonus_data->data.size(), short_sha1(bonus_digest).c_str());
return 1; return 1;
} else { } else {
printf("now %s\n", short_sha1(target_sha1).c_str()); printf("now %s\n", short_sha1(target_sha1).c_str());

5
tests/component/applypatch_test.cpp
View File

@@ -344,6 +344,11 @@ TEST_F(ApplyPatchModesTest, PatchModeEmmcTargetWithMultiplePatches) {
patch1.c_str(), patch1.c_str(),
patch2.c_str(), patch2.c_str(),
patch3.c_str() }; patch3.c_str() };
// TODO(b/67849209): Remove after addressing the flakiness.
printf("Calling applypatch_modes with the following args:\n");
for (const auto& arg : args) {
printf(" %s\n", arg);
}
ASSERT_EQ(0, applypatch_modes(args.size(), args.data())); ASSERT_EQ(0, applypatch_modes(args.size(), args.data()));
} }