summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2018-04-19 23:52:35 +0200
committerandroid-build-merger <android-build-merger@google.com>2018-04-19 23:52:35 +0200
commit84a978cbcf6e5d41ecd49c010ed33f936d4ebfe7 (patch)
tree72a5befe299382ffc4aec15f7127aa8e4f003f17
parentMerge "Add sample_updater style check to PREUPLOAD.cfg" am: 73e6644777 (diff)
parentMerge "applypatch: Dump patch info on mismatching patching result." (diff)
downloadandroid_bootable_recovery-84a978cbcf6e5d41ecd49c010ed33f936d4ebfe7.tar
android_bootable_recovery-84a978cbcf6e5d41ecd49c010ed33f936d4ebfe7.tar.gz
android_bootable_recovery-84a978cbcf6e5d41ecd49c010ed33f936d4ebfe7.tar.bz2
android_bootable_recovery-84a978cbcf6e5d41ecd49c010ed33f936d4ebfe7.tar.lz
android_bootable_recovery-84a978cbcf6e5d41ecd49c010ed33f936d4ebfe7.tar.xz
android_bootable_recovery-84a978cbcf6e5d41ecd49c010ed33f936d4ebfe7.tar.zst
android_bootable_recovery-84a978cbcf6e5d41ecd49c010ed33f936d4ebfe7.zip
-rw-r--r--applypatch/applypatch.cpp17
-rw-r--r--tests/component/applypatch_test.cpp5
2 files changed, 21 insertions, 1 deletions
diff --git a/applypatch/applypatch.cpp b/applypatch/applypatch.cpp
index 6f6c187be..120add6d6 100644
--- a/applypatch/applypatch.cpp
+++ b/applypatch/applypatch.cpp
@@ -652,7 +652,22 @@ static int GenerateTarget(const FileContents& source_file, const std::unique_ptr
uint8_t current_target_sha1[SHA_DIGEST_LENGTH];
SHA1_Final(current_target_sha1, &ctx);
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;
} else {
printf("now %s\n", short_sha1(target_sha1).c_str());
diff --git a/tests/component/applypatch_test.cpp b/tests/component/applypatch_test.cpp
index aa0959bf5..f19f28c60 100644
--- a/tests/component/applypatch_test.cpp
+++ b/tests/component/applypatch_test.cpp
@@ -344,6 +344,11 @@ TEST_F(ApplyPatchModesTest, PatchModeEmmcTargetWithMultiplePatches) {
patch1.c_str(),
patch2.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()));
}