commit 1fa46b28d87aacf2b9b10df41339f0a20c24d84c
author Yabin Cui <yabinc@google.com> Fri Mar 09 20:17:38 2018 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 09 20:17:38 2018 +0000
tree 9452221bf29fdab158d5e0ee3b20d7299b3b1218
parent 44a0fc194573e734b6a71b91c3bef07983961da5
parent b4740aad95762994774746068f7d0c12f0447224

Merge "base: Add TemporaryFile::DoNotRemove()." am: 04bf02374c
am: 8e7844d69e

Change-Id: Iaec0312075a7b9c5dbed490271ab5183e3e163d5

base/include/android-base/test_utils.h

diff --git a/base/include/android-base/test_utils.h b/base/include/android-base/test_utils.h
index 2edafe3..b95fa07 100644
--- a/base/include/android-base/test_utils.h
+++ b/base/include/android-base/test_utils.h
@@ -31,6 +31,8 @@
   // Release the ownership of fd, caller is reponsible for closing the
   // fd or stream properly.
   int release();
+  // Don't remove the temporary file in the destructor.
+  void DoNotRemove() { remove_file_ = false; }
 
   int fd;
   char path[1024];
@@ -38,6 +40,8 @@
  private:
   void init(const std::string& tmp_dir);
 
+  bool remove_file_ = true;
+
   DISALLOW_COPY_AND_ASSIGN(TemporaryFile);
 };
 

base/test_utils.cpp

diff --git a/base/test_utils.cpp b/base/test_utils.cpp
index 9d8dfb2..1619c21 100644
--- a/base/test_utils.cpp
+++ b/base/test_utils.cpp
@@ -92,7 +92,9 @@
   if (fd != -1) {
     close(fd);
   }
-  unlink(path);
+  if (remove_file_) {
+    unlink(path);
+  }
 }
 
 int TemporaryFile::release() {