commit 7eb788ca3210c517c5ae4ed60dab803ee08201a8
author Yabin Cui <yabinc@google.com> Thu Dec 07 18:31:36 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Dec 07 18:31:36 2017 +0000
tree 464752bd809267c1329d36a23bb0d30780a3aebe
parent 51aa36aa9735ee29e8593a1d12f2f20d5670bd9b
parent ff5b63d5cac0d04ab9d23434a2e1a9472c48be0d

Merge "base: allow creating tempfile in a custom temporary dir."
am: 665f144566

Change-Id: Ibf63af87835763700682163cbe8feb60dc081b01

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 07a5edd..4cfa06b 100644
--- a/base/include/android-base/test_utils.h
+++ b/base/include/android-base/test_utils.h
@@ -24,6 +24,7 @@
 class TemporaryFile {
  public:
   TemporaryFile();
+  explicit TemporaryFile(const std::string& tmp_dir);
   ~TemporaryFile();
 
   // Release the ownership of fd, caller is reponsible for closing the

base/test_utils.cpp

diff --git a/base/test_utils.cpp b/base/test_utils.cpp
index 1cfa9e6..9d8dfb2 100644
--- a/base/test_utils.cpp
+++ b/base/test_utils.cpp
@@ -84,6 +84,10 @@
   init(GetSystemTempDir());
 }
 
+TemporaryFile::TemporaryFile(const std::string& tmp_dir) {
+  init(tmp_dir);
+}
+
 TemporaryFile::~TemporaryFile() {
   if (fd != -1) {
     close(fd);