commit 84a978cbcf6e5d41ecd49c010ed33f936d4ebfe7
author Tao Bao <tbao@google.com> Thu Apr 19 14:52:35 2018 -0700
committer android-build-merger <android-build-merger@google.com> Thu Apr 19 14:52:35 2018 -0700
tree 72a5befe299382ffc4aec15f7127aa8e4f003f17
parent b21a990e7513461418755ff5fe7b9b29f0f02fe5
parent ea70fd7d1ddf7be9f0f1673e022bcf949b8ea249

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

Change-Id: Ie9c674215caac891702d09d30f6858226ffe807c

applypatch/applypatch.cpp

diff --git a/applypatch/applypatch.cpp b/applypatch/applypatch.cpp
index 6f6c187..120add6 100644
--- a/applypatch/applypatch.cpp
+++ b/applypatch/applypatch.cpp
@@ -652,7 +652,22 @@
   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());

tests/component/applypatch_test.cpp

diff --git a/tests/component/applypatch_test.cpp b/tests/component/applypatch_test.cpp
index aa0959b..f19f28c 100644
--- a/tests/component/applypatch_test.cpp
+++ b/tests/component/applypatch_test.cpp
@@ -344,6 +344,11 @@
                                     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()));
 }