aboutsummaryrefslogtreecommitdiff
path: root/patch_read_write_unittest.cc
diff options
context:
space:
mode:
authorSamuel Huang <huangs@chromium.org>2018-03-28 22:20:09 +0000
committerEdward Lesmes <ehmaldonado@google.com>2021-07-23 22:00:41 +0000
commit1a73d78bea5b940a8f5499e31ad9794d9aa7d475 (patch)
tree08744f9e46995c6b109993b8264ce3f46bbde0ef /patch_read_write_unittest.cc
parent4feab7d1a15a2aaa51f34f24c68ec80d285948ee (diff)
downloadzucchini-1a73d78bea5b940a8f5499e31ad9794d9aa7d475.tar.gz
[Zucchini] Format change: Remove PatchType.
Previously, Zucchini patches store a uint32_t PatchType enum that distinguishes among (0) raw patch, (1) single executable patch, and (2) ensemble patch. However, ever since every element (and gap) stores ExecutableType, this PatchType field has become a vestige. This CL simplifies Zucchini by removing PatchType, including in README.md and tests. This CL alters Zucchini patch format (removes 4 bytes); patches created across this change are incompatible. Bug: 729154 Change-Id: Ia5f467ba5e01720f5085ce87a5de88f678a64930 Reviewed-on: https://chromium-review.googlesource.com/981789 Commit-Queue: Samuel Huang <huangs@chromium.org> Reviewed-by: Greg Thompson <grt@chromium.org> Cr-Commit-Position: refs/heads/master@{#546621} NOKEYCHECK=True GitOrigin-RevId: 325bcee07f3eb9e3604c8aa0367ae7145025ddb6
Diffstat (limited to 'patch_read_write_unittest.cc')
-rw-r--r--patch_read_write_unittest.cc7
1 files changed, 0 insertions, 7 deletions
diff --git a/patch_read_write_unittest.cc b/patch_read_write_unittest.cc
index 7f84b03..b701df8 100644
--- a/patch_read_write_unittest.cc
+++ b/patch_read_write_unittest.cc
@@ -484,8 +484,6 @@ TEST(EnsemblePatchTest, RawPatch) {
0x98, 0xBA, 0xDC, 0xFE, // new_size
0x44, 0x55, 0x66, 0x77, // new_crc
- 0, 0, 0, 0, // kRawPatch
-
1, 0, 0, 0, // number of element
0x01, 0, 0, 0, // old_offset
@@ -513,14 +511,11 @@ TEST(EnsemblePatchTest, RawPatch) {
EXPECT_EQ(0xFEDCBA98U, header.new_size);
EXPECT_EQ(0x77665544U, header.new_crc);
- EXPECT_EQ(PatchType::kRawPatch, ensemble_patch_reader.patch_type());
-
const std::vector<PatchElementReader>& elements =
ensemble_patch_reader.elements();
EXPECT_EQ(size_t(1), elements.size());
EnsemblePatchWriter ensemble_patch_writer(header);
- ensemble_patch_writer.SetPatchType(PatchType::kRawPatch);
PatchElementWriter patch_element_writer(elements[0].element_match());
patch_element_writer.SetEquivalenceSink({});
patch_element_writer.SetExtraDataSink({});
@@ -538,7 +533,6 @@ TEST(EnsemblePatchTest, CheckFile) {
0xDF, 0x13, 0xE4, 0x10, // old_crc
0x03, 0x00, 0x00, 0x00, // new_size
0xDC, 0xF7, 0x00, 0x40, // new_crc
- 2, 0, 0, 0, // kEnsemblePatch
1, 0, 0, 0, // number of element
@@ -579,7 +573,6 @@ TEST(EnsemblePatchTest, InvalidMagic) {
0x00, 0x11, 0x22, 0x33, // old_crc
0x03, 0x00, 0x00, 0x00, // new_size
0x44, 0x55, 0x66, 0x77, // new_crc
- 0, 0, 0, 0, // kRawPatch
1, 0, 0, 0, // number of element