diff options
author | Elliott Hughes <enh@google.com> | 2021-05-06 17:56:16 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-06 17:56:16 +0000 |
commit | 8b0c6c7eb318bdfd4cb550c7fe9905053f088aa3 (patch) | |
tree | 54fb90f190c69a329c719650bad4fe22bf879033 /googletest/src/gtest-port.cc | |
parent | 8265b03dbb2bf5af212ed26bf7c722fad6da4c42 (diff) | |
parent | 7eb07fcee44922675a4265334252bceb502a74d0 (diff) | |
download | googletest-8b0c6c7eb318bdfd4cb550c7fe9905053f088aa3.tar.gz |
Merge commit 'f5e592d8ee5ffb1d9af5be7f715ce3576b8bf9c4' into update am: b1a925fc62 am: 0ec2f9faa0 am: 7eb07fcee4
Original change: https://android-review.googlesource.com/c/platform/external/googletest/+/1697317
Change-Id: I093d52b5973abab0299c489683b6b21ae8a5e394
Diffstat (limited to 'googletest/src/gtest-port.cc')
-rw-r--r-- | googletest/src/gtest-port.cc | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/googletest/src/gtest-port.cc b/googletest/src/gtest-port.cc index c7717cfb..78f7587b 100644 --- a/googletest/src/gtest-port.cc +++ b/googletest/src/gtest-port.cc @@ -80,6 +80,10 @@ # include <zircon/syscalls.h> #endif // GTEST_OS_FUCHSIA +#if GTEST_OS_IOS +#import <Foundation/Foundation.h> +#endif // GTEST_OS_IOS + #include "gtest/gtest-spi.h" #include "gtest/gtest-message.h" #include "gtest/internal/gtest-internal.h" @@ -1111,9 +1115,15 @@ class CapturedStream { // guaranteed to be mounted, or may have a delay in mounting. ::std::string name_template_buf = TempDir() + "gtest_captured_stream.XXXXXX"; char* name_template = &name_template_buf[0]; +# elif GTEST_OS_IOS + NSString* temp_path = [NSTemporaryDirectory() + stringByAppendingPathComponent:@"gtest_captured_stream.XXXXXX"]; + + char name_template[PATH_MAX + 1]; + strncpy(name_template, [temp_path UTF8String], PATH_MAX); # else char name_template[] = "/tmp/captured_stream.XXXXXX"; -# endif // GTEST_OS_LINUX_ANDROID +# endif const int captured_fd = mkstemp(name_template); if (captured_fd == -1) { GTEST_LOG_(WARNING) |