From 76491b74de24c743f6e1780eaee91c589e757b11 Mon Sep 17 00:00:00 2001 From: Gennadiy Civil Date: Thu, 18 May 2017 10:19:28 -0400 Subject: Changes add ability to overwrite TempDir(), issue https://github.com/google/googletest/issues/1093 --- googletest/include/gtest/internal/custom/gtest.h | 4 ++++ googletest/src/gtest.cc | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/googletest/include/gtest/internal/custom/gtest.h b/googletest/include/gtest/internal/custom/gtest.h index c27412a..a7a1c0b 100644 --- a/googletest/include/gtest/internal/custom/gtest.h +++ b/googletest/include/gtest/internal/custom/gtest.h @@ -33,6 +33,10 @@ // GTEST_OS_STACK_TRACE_GETTER_ - The name of an implementation of // OsStackTraceGetterInterface. // +// GTEST_CUSTOM_TEMPDIR_FUNCTION_ - An override for testing::TempDir(). +// See testing::TempDir for semantics and +// signature. +// // ** Custom implementation starts here ** #ifndef GTEST_INCLUDE_GTEST_INTERNAL_CUSTOM_GTEST_H_ diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index de03212..3a18f25 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -5385,6 +5385,9 @@ void InitGoogleTest(int* argc, wchar_t** argv) { } std::string TempDir() { +#if defined(GTEST_CUSTOM_TEMPDIR_FUNCTION_) + return GTEST_CUSTOM_TEMPDIR_FUNCTION_(); +#endif #if GTEST_OS_WINDOWS_MOBILE return "\\temp\\"; #elif GTEST_OS_WINDOWS @@ -5402,5 +5405,4 @@ std::string TempDir() { #endif // GTEST_OS_WINDOWS_MOBILE } - } // namespace testing -- cgit v0.12