diff options
| author | Tianjie Xu <xunchang@google.com> | 2017-09-17 23:45:23 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-17 23:45:23 +0200 |
| commit | ed50c1817fc0ab29dcd08f1765eb50e0baa80123 (patch) | |
| tree | f2985b603220017ddb1bb52d12310823d357c6c5 | |
| parent | Merge "Remove EXPAND/STRINGIFY macros." am: 6e7df82c7b (diff) | |
| parent | Merge "Fix the dangling pointer when setting up arguments of imgdiff" (diff) | |
| download | android_bootable_recovery-ed50c1817fc0ab29dcd08f1765eb50e0baa80123.tar android_bootable_recovery-ed50c1817fc0ab29dcd08f1765eb50e0baa80123.tar.gz android_bootable_recovery-ed50c1817fc0ab29dcd08f1765eb50e0baa80123.tar.bz2 android_bootable_recovery-ed50c1817fc0ab29dcd08f1765eb50e0baa80123.tar.lz android_bootable_recovery-ed50c1817fc0ab29dcd08f1765eb50e0baa80123.tar.xz android_bootable_recovery-ed50c1817fc0ab29dcd08f1765eb50e0baa80123.tar.zst android_bootable_recovery-ed50c1817fc0ab29dcd08f1765eb50e0baa80123.zip | |
| -rw-r--r-- | tests/component/imgdiff_test.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/tests/component/imgdiff_test.cpp b/tests/component/imgdiff_test.cpp index 3163a57cf..73516050b 100644 --- a/tests/component/imgdiff_test.cpp +++ b/tests/component/imgdiff_test.cpp @@ -779,9 +779,10 @@ TEST(ImgdiffTest, zip_mode_store_large_apk) { // Compute patch. TemporaryFile patch_file; TemporaryDir debug_dir; + std::string debug_dir_arg = android::base::StringPrintf("--debug-dir=%s", debug_dir.path); std::vector<const char*> args = { - "imgdiff", "-z", "--block-limit=10", android::base::StringPrintf( - "--debug-dir=%s", debug_dir.path).c_str(), src_file.path, tgt_file.path, patch_file.path, + "imgdiff", "-z", "--block-limit=10", debug_dir_arg.c_str(), src_file.path, tgt_file.path, + patch_file.path, }; ASSERT_EQ(0, imgdiff(args.size(), args.data())); @@ -901,9 +902,10 @@ TEST(ImgdiffTest, zip_mode_no_match_source) { // Compute patch. TemporaryFile patch_file; TemporaryDir debug_dir; + std::string debug_dir_arg = android::base::StringPrintf("--debug-dir=%s", debug_dir.path); std::vector<const char*> args = { - "imgdiff", "-z", "--block-limit=10", android::base::StringPrintf( - "--debug-dir=%s", debug_dir.path).c_str(), src_file.path, tgt_file.path, patch_file.path, + "imgdiff", "-z", "--block-limit=10", debug_dir_arg.c_str(), src_file.path, tgt_file.path, + patch_file.path, }; ASSERT_EQ(0, imgdiff(args.size(), args.data())); @@ -940,9 +942,10 @@ TEST(ImgdiffTest, zip_mode_large_enough_limit) { // Compute patch with a limit of 20 blocks. TemporaryFile patch_file; TemporaryDir debug_dir; + std::string debug_dir_arg = android::base::StringPrintf("--debug-dir=%s", debug_dir.path); std::vector<const char*> args = { - "imgdiff", "-z", "--block-limit=20", android::base::StringPrintf( - "--debug-dir=%s", debug_dir.path).c_str(), src_file.path, tgt_file.path, patch_file.path, + "imgdiff", "-z", "--block-limit=20", debug_dir_arg.c_str(), src_file.path, tgt_file.path, + patch_file.path, }; ASSERT_EQ(0, imgdiff(args.size(), args.data())); |