commit e29f34c3134d76284292b8c1400660cdb9995030
author Yabin Cui <yabinc@google.com> Thu Dec 07 18:42:53 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Dec 07 18:42:53 2017 +0000
tree 2652cf4ee6b2319a59ed7c73410e012bb7538eca
parent 3b35bea2861cbc39065ad0f76ceb0132c5b79a2c
parent 7eb788ca3210c517c5ae4ed60dab803ee08201a8

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

Change-Id: I28c8921cb9c1ee3be00a2dddc3048697e184cff4

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);