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

Merge "Save the target file when applypatch tests fail"

Browse Source 
am: 957c1abfba

Change-Id: I100dd5ba4fb2c3bd4a29bd8759dcd65f03afbe50
This commit is contained in:
Tianjie Xu
2018-04-27 09:53:47 -07:00
committed by android-build-merger
parent 811baa37d3 957c1abfba
commit 7ad3e673ba
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applypatch/applypatch.cpp
+8
View File
@@ -672,6 +672,14 @@ static int GenerateTarget(const FileContents& source_file, const std::unique_ptr
bonus_digest); bonus_digest);
printf("bonus size %zu sha1 %s\n", bonus_data->data.size(), short_sha1(bonus_digest).c_str()); printf("bonus size %zu sha1 %s\n", bonus_data->data.size(), short_sha1(bonus_digest).c_str());
// TODO(b/67849209) Remove after debugging the unit test flakiness.
if (android::base::GetMinimumLogSeverity() <= android::base::LogSeverity::DEBUG) {
if (WriteToPartition(reinterpret_cast<const unsigned char*>(memory_sink_str.c_str()),
memory_sink_str.size(), target_filename) != 0) {
LOG(DEBUG) << "Failed to write patched data " << target_filename;
}
}
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());
applypatch/imgpatch.cpp
+10 -14
View File
@@ -60,6 +60,11 @@ static bool ApplyBSDiffPatchAndStreamOutput(const uint8_t* src_data, size_t src_
int mem_level = Read4(deflate_header + 52); int mem_level = Read4(deflate_header + 52);
int strategy = Read4(deflate_header + 56); int strategy = Read4(deflate_header + 56);
// TODO(b/67849209) Remove after debugging the unit test flakiness.
if (android::base::GetMinimumLogSeverity() <= android::base::LogSeverity::DEBUG) {
LOG(DEBUG) << "zlib version " << zlibVersion();
}
z_stream strm; z_stream strm;
strm.zalloc = Z_NULL; strm.zalloc = Z_NULL;
strm.zfree = Z_NULL; strm.zfree = Z_NULL;
@@ -101,26 +106,17 @@ static bool ApplyBSDiffPatchAndStreamOutput(const uint8_t* src_data, size_t src_
size_t have = buffer_size - strm.avail_out; size_t have = buffer_size - strm.avail_out;
total_written += have; total_written += have;
// TODO(b/67849209) Remove after debugging the unit test flakiness.
if (android::base::GetMinimumLogSeverity() <= android::base::LogSeverity::DEBUG &&
have != 0) {
SHA1_Update(&sha_ctx, data, len - strm.avail_in);
SHA_CTX temp_ctx;
memcpy(&temp_ctx, &sha_ctx, sizeof(SHA_CTX));
uint8_t digest_so_far[SHA_DIGEST_LENGTH];
SHA1_Final(digest_so_far, &temp_ctx);
LOG(DEBUG) << "Processed " << actual_target_length + len - strm.avail_in
<< " bytes input data in the sink function, sha1 so far: "
<< short_sha1(digest_so_far);
}
if (sink(buffer.data(), have) != have) { if (sink(buffer.data(), have) != have) {
LOG(ERROR) << "Failed to write " << have << " compressed bytes to output."; LOG(ERROR) << "Failed to write " << have << " compressed bytes to output.";
return 0; return 0;
} }
} while ((strm.avail_in != 0 || strm.avail_out == 0) && ret != Z_STREAM_END); } while ((strm.avail_in != 0 || strm.avail_out == 0) && ret != Z_STREAM_END);
// TODO(b/67849209) Remove after debugging the unit test flakiness.
if (android::base::GetMinimumLogSeverity() <= android::base::LogSeverity::DEBUG) {
SHA1_Update(&sha_ctx, data, len);
}
actual_target_length += len; actual_target_length += len;
return len; return len;
}; };