summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-11-02 06:21:55 +0100
committerTao Bao <tbao@google.com>2017-11-02 06:34:51 +0100
commit54c1db4b3e6becf85f2b685f16425244b24138a6 (patch)
tree644d10709dc1d5f03d13e092e8569a7b04ff4377 /tests
parentMerge "Fix the size mismatch in imgdiff" (diff)
downloadandroid_bootable_recovery-54c1db4b3e6becf85f2b685f16425244b24138a6.tar
android_bootable_recovery-54c1db4b3e6becf85f2b685f16425244b24138a6.tar.gz
android_bootable_recovery-54c1db4b3e6becf85f2b685f16425244b24138a6.tar.bz2
android_bootable_recovery-54c1db4b3e6becf85f2b685f16425244b24138a6.tar.lz
android_bootable_recovery-54c1db4b3e6becf85f2b685f16425244b24138a6.tar.xz
android_bootable_recovery-54c1db4b3e6becf85f2b685f16425244b24138a6.tar.zst
android_bootable_recovery-54c1db4b3e6becf85f2b685f16425244b24138a6.zip
Diffstat (limited to 'tests')
-rw-r--r--tests/component/imgdiff_test.cpp14
1 files changed, 9 insertions, 5 deletions
diff --git a/tests/component/imgdiff_test.cpp b/tests/component/imgdiff_test.cpp
index 6de804e06..728b6cc76 100644
--- a/tests/component/imgdiff_test.cpp
+++ b/tests/component/imgdiff_test.cpp
@@ -657,19 +657,23 @@ static void construct_deflate_entry(const std::vector<std::tuple<std::string, si
}
}
-// Look for the generated source and patch pieces in the debug_dir and generate the target on
-// each pair. Concatenate the split target and match against the orignal one.
+// Look for the source and patch pieces in debug_dir. Generate a target piece from each pair.
+// Concatenate all the target pieces and match against the orignal one. Used pieces in debug_dir
+// will be cleaned up.
static void GenerateAndCheckSplitTarget(const std::string& debug_dir, size_t count,
const std::string& tgt) {
std::string patched;
for (size_t i = 0; i < count; i++) {
std::string split_src_path = android::base::StringPrintf("%s/src-%zu", debug_dir.c_str(), i);
- std::string split_patch_path = android::base::StringPrintf("%s/patch-%zu", debug_dir.c_str(), i);
-
std::string split_src;
- std::string split_patch;
ASSERT_TRUE(android::base::ReadFileToString(split_src_path, &split_src));
+ ASSERT_EQ(0, unlink(split_src_path.c_str()));
+
+ std::string split_patch_path =
+ android::base::StringPrintf("%s/patch-%zu", debug_dir.c_str(), i);
+ std::string split_patch;
ASSERT_TRUE(android::base::ReadFileToString(split_patch_path, &split_patch));
+ ASSERT_EQ(0, unlink(split_patch_path.c_str()));
std::string split_tgt;
GenerateTarget(split_src, split_patch, &split_tgt);