diff options
| author | Billy Donahue <BillyDonahue@users.noreply.github.com> | 2017-05-18 16:19:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-18 16:19:58 -0400 |
| commit | 59c795ce08be0c8b225bc894f8da6c7954ea5c14 (patch) | |
| tree | 42710fec8b759352c5df2ab666b06b7efc7904d8 | |
| parent | 7cc548dcbf266d48c9b3fe8ec30c2f2ba8acb1d9 (diff) | |
| parent | 76491b74de24c743f6e1780eaee91c589e757b11 (diff) | |
| download | googletest-59c795ce08be0c8b225bc894f8da6c7954ea5c14.tar.gz | |
Merge pull request #1096 from gennadiycivil/add-ability-for-custom-temdir-1093
Changes add ability to overwrite TempDir(), issue https://github.com/…
| -rw-r--r-- | googletest/include/gtest/internal/custom/gtest.h | 4 | ||||
| -rw-r--r-- | googletest/src/gtest.cc | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/googletest/include/gtest/internal/custom/gtest.h b/googletest/include/gtest/internal/custom/gtest.h index c27412a8..a7a1c0b7 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 de03212d..3a18f25d 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 |