Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d425351e authored by Kelvin Zhang's avatar Kelvin Zhang Committed by Automerger Merge Worker
Browse files

Merge changes from topic "imgdiff" am: e7a060a9 am: b2c7beb2 

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/1548894

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9aa6658475c11275e806d50b1e3f5a4e319b57dd
parents 0d375c65 b2c7beb2

tests/testdata/recovery-from-boot.p

+6 B (5.28 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

tests/unit/applypatch_modes_test.cpp

+2 −2
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ TEST_F(ApplyPatchModesTest, InvalidArgs) { 
  ASSERT_EQ(2, InvokeApplyPatchModes({ "applypatch", "-x" }));

}



TEST_F(ApplyPatchModesTest, DISABLED_PatchModeEmmcTarget) {

TEST_F(ApplyPatchModesTest, PatchModeEmmcTarget) {

  std::vector<std::string> args{

    "applypatch",

    "--bonus",
@@ -118,7 +118,7 @@ TEST_F(ApplyPatchModesTest, DISABLED_PatchModeEmmcTarget) { 


// Tests patching an eMMC target without a separate bonus file (i.e. recovery-from-boot patch has

// everything).

TEST_F(ApplyPatchModesTest, DISABLED_PatchModeEmmcTargetWithoutBonusFile) {

TEST_F(ApplyPatchModesTest, PatchModeEmmcTargetWithoutBonusFile) {

  std::vector<std::string> args{

    "applypatch", "--patch", from_testdata_base("recovery-from-boot-with-bonus.p"),

    "--target",   target,    "--source",

tests/unit/applypatch_test.cpp

+2 −2
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ TEST_F(ApplyPatchTest, PatchPartitionCheck_UseBackup_BothCorrupted) { 
      PatchPartitionCheck(target_partition, Partition(target_file, source_size, source_sha1)));

}



TEST_F(ApplyPatchTest, DISABLED_PatchPartition) {

TEST_F(ApplyPatchTest, PatchPartition) {

  FileContents patch_fc;

  ASSERT_TRUE(LoadFileContents(from_testdata_base("recovery-from-boot.p"), &patch_fc));

  Value patch(Value::Type::BLOB, std::string(patch_fc.data.cbegin(), patch_fc.data.cend()));
@@ -146,7 +146,7 @@ TEST_F(ApplyPatchTest, DISABLED_PatchPartition) { 


// Tests patching an eMMC target without a separate bonus file (i.e. recovery-from-boot patch has

// everything).

TEST_F(ApplyPatchTest, DISABLED_PatchPartitionWithoutBonusFile) {

TEST_F(ApplyPatchTest, PatchPartitionWithoutBonusFile) {

  FileContents patch_fc;

  ASSERT_TRUE(LoadFileContents(from_testdata_base("recovery-from-boot-with-bonus.p"), &patch_fc));

  Value patch(Value::Type::BLOB, std::string(patch_fc.data.cbegin(), patch_fc.data.cend()));