Skip to content

Commit

Permalink
Googletest export
Browse files Browse the repository at this point in the history
Fix iOS logging issues in tests

PiperOrigin-RevId: 370484087
  • Loading branch information
Abseil Team authored and derekmauro committed Apr 26, 2021
1 parent 11da093 commit 252ce9c
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 1 deletion.
10 changes: 10 additions & 0 deletions BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,12 @@ config_setting(
values = {"define": "absl=1"},
)

config_setting(
name = "ios",
values = {"apple_platform_type": "ios"},
visibility = [":__subpackages__"],
)

# Library that defines the FRIEND_TEST macro.
cc_library(
name = "gtest_prod",
Expand Down Expand Up @@ -86,6 +92,10 @@ cc_library(
"googlemock/include/gmock/*.h",
]),
copts = select({
":ios": [
"-xobjective-c++",
"-pthread",
],
":windows": [],
"//conditions:default": ["-pthread"],
}),
Expand Down
12 changes: 11 additions & 1 deletion googletest/src/gtest-port.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -1111,9 +1115,15 @@ class CapturedStream {
// '/sdcard' and other variants cannot be relied on, as they are not
// guaranteed to be mounted, or may have a delay in mounting.
char name_template[] = "/data/local/tmp/gtest_captured_stream.XXXXXX";
# 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)
Expand Down

0 comments on commit 252ce9c

Please sign in to comment.