diff options
| author | Kelvin Zhang <zhangkelvin@google.com> | 2021-01-14 17:02:35 +0100 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-14 17:02:35 +0100 |
| commit | d425351e4fba2e891ac343ac24a22e69ad3aa3f9 (patch) | |
| tree | 2e0ed9f9b378f6ed04358f78fdab205a39268850 | |
| parent | Switch imgdiff to use libz_stable am: 2f2749f213 am: 9997438c1c (diff) | |
| parent | Merge changes from topic "imgdiff" am: e7a060a91b (diff) | |
| download | android_bootable_recovery-d425351e4fba2e891ac343ac24a22e69ad3aa3f9.tar android_bootable_recovery-d425351e4fba2e891ac343ac24a22e69ad3aa3f9.tar.gz android_bootable_recovery-d425351e4fba2e891ac343ac24a22e69ad3aa3f9.tar.bz2 android_bootable_recovery-d425351e4fba2e891ac343ac24a22e69ad3aa3f9.tar.lz android_bootable_recovery-d425351e4fba2e891ac343ac24a22e69ad3aa3f9.tar.xz android_bootable_recovery-d425351e4fba2e891ac343ac24a22e69ad3aa3f9.tar.zst android_bootable_recovery-d425351e4fba2e891ac343ac24a22e69ad3aa3f9.zip | |
| -rw-r--r-- | tests/testdata/recovery-from-boot.p | bin | 5404 -> 5410 bytes | |||
| -rw-r--r-- | tests/unit/applypatch_modes_test.cpp | 4 | ||||
| -rw-r--r-- | tests/unit/applypatch_test.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tests/testdata/recovery-from-boot.p b/tests/testdata/recovery-from-boot.p Binary files differindex 06f6c299f..81738ed29 100644 --- a/tests/testdata/recovery-from-boot.p +++ b/tests/testdata/recovery-from-boot.p diff --git a/tests/unit/applypatch_modes_test.cpp b/tests/unit/applypatch_modes_test.cpp index 9e9797950..08414b796 100644 --- a/tests/unit/applypatch_modes_test.cpp +++ b/tests/unit/applypatch_modes_test.cpp @@ -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", diff --git a/tests/unit/applypatch_test.cpp b/tests/unit/applypatch_test.cpp index 4b80dcee9..218a224f8 100644 --- a/tests/unit/applypatch_test.cpp +++ b/tests/unit/applypatch_test.cpp @@ -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())); |