commit b4740aad95762994774746068f7d0c12f0447224
author Yabin Cui <yabinc@google.com> Fri Mar 09 19:46:15 2018 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 09 19:46:15 2018 +0000
tree 5449b40515e630871b9b352af88a2cdbae7c57fb
parent 12356cdb338212be37e7c1e480649088321cb163
parent 9d794bc2ff4834f4f97e84911a6e94e5e624c7a9

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

Change-Id: I414f7b2be3bc945d8ba829f388bc0dee10219c9c

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() {