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

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

Merge changes from topic "imgdiff" am: e7a060a9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I05720babfa906eae2d54979e9de1e7fe4853a4c0
parents 9997438c e7a060a9
Loading
Loading
Loading
Loading
+6 B (5.28 KiB)

File changed.

No diff preview for this file type.

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


TEST_F(ApplyPatchModesTest, DISABLED_PatchModeEmmcTarget) {
TEST_F(ApplyPatchModesTest, PatchModeEmmcTarget) {
  std::vector<std::string> args{
  std::vector<std::string> args{
    "applypatch",
    "applypatch",
    "--bonus",
    "--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
// Tests patching an eMMC target without a separate bonus file (i.e. recovery-from-boot patch has
// everything).
// everything).
TEST_F(ApplyPatchModesTest, DISABLED_PatchModeEmmcTargetWithoutBonusFile) {
TEST_F(ApplyPatchModesTest, PatchModeEmmcTargetWithoutBonusFile) {
  std::vector<std::string> args{
  std::vector<std::string> args{
    "applypatch", "--patch", from_testdata_base("recovery-from-boot-with-bonus.p"),
    "applypatch", "--patch", from_testdata_base("recovery-from-boot-with-bonus.p"),
    "--target",   target,    "--source",
    "--target",   target,    "--source",
+2 −2
Original line number Original line 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)));
      PatchPartitionCheck(target_partition, Partition(target_file, source_size, source_sha1)));
}
}


TEST_F(ApplyPatchTest, DISABLED_PatchPartition) {
TEST_F(ApplyPatchTest, PatchPartition) {
  FileContents patch_fc;
  FileContents patch_fc;
  ASSERT_TRUE(LoadFileContents(from_testdata_base("recovery-from-boot.p"), &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()));
  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
// Tests patching an eMMC target without a separate bonus file (i.e. recovery-from-boot patch has
// everything).
// everything).
TEST_F(ApplyPatchTest, DISABLED_PatchPartitionWithoutBonusFile) {
TEST_F(ApplyPatchTest, PatchPartitionWithoutBonusFile) {
  FileContents patch_fc;
  FileContents patch_fc;
  ASSERT_TRUE(LoadFileContents(from_testdata_base("recovery-from-boot-with-bonus.p"), &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()));
  Value patch(Value::Type::BLOB, std::string(patch_fc.data.cbegin(), patch_fc.data.cend()));