PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "tests: Clean up the files in TemporaryDir."

Browse Source
This commit is contained in:
Treehugger Robot
2017-11-03 18:51:34 +00:00
committed by Gerrit Code Review
parent 439263cb83 54c1db4b3e
commit 2cf44d08cf
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/component/imgdiff_test.cpp
+9 -5
View File
@@ -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 // Look for the source and patch pieces in debug_dir. Generate a target piece from each pair.
// each pair. Concatenate the split target and match against the orignal one. // 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, static void GenerateAndCheckSplitTarget(const std::string& debug_dir, size_t count,
const std::string& tgt) { const std::string& tgt) {
std::string patched; std::string patched;
for (size_t i = 0; i < count; i++) { 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_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_src;
std::string split_patch;
ASSERT_TRUE(android::base::ReadFileToString(split_src_path, &split_src)); 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_TRUE(android::base::ReadFileToString(split_patch_path, &split_patch));
ASSERT_EQ(0, unlink(split_patch_path.c_str()));
std::string split_tgt; std::string split_tgt;
GenerateTarget(split_src, split_patch, &split_tgt); GenerateTarget(split_src, split_patch, &split_tgt);