Googletest export
Fix iOS logging issues in tests PiperOrigin-RevId: 370484087
This commit is contained in:
		
							
								
								
									
										10
									
								
								BUILD.bazel
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								BUILD.bazel
									
									
									
									
									
								
							@@ -56,6 +56,12 @@ config_setting(
 | 
				
			|||||||
    values = {"define": "absl=1"},
 | 
					    values = {"define": "absl=1"},
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					config_setting(
 | 
				
			||||||
 | 
					    name = "ios",
 | 
				
			||||||
 | 
					    values = {"apple_platform_type": "ios"},
 | 
				
			||||||
 | 
					    visibility = [":__subpackages__"],
 | 
				
			||||||
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Library that defines the FRIEND_TEST macro.
 | 
					# Library that defines the FRIEND_TEST macro.
 | 
				
			||||||
cc_library(
 | 
					cc_library(
 | 
				
			||||||
    name = "gtest_prod",
 | 
					    name = "gtest_prod",
 | 
				
			||||||
@@ -86,6 +92,10 @@ cc_library(
 | 
				
			|||||||
        "googlemock/include/gmock/*.h",
 | 
					        "googlemock/include/gmock/*.h",
 | 
				
			||||||
    ]),
 | 
					    ]),
 | 
				
			||||||
    copts = select({
 | 
					    copts = select({
 | 
				
			||||||
 | 
					        ":ios": [
 | 
				
			||||||
 | 
					            "-xobjective-c++",
 | 
				
			||||||
 | 
					            "-pthread",
 | 
				
			||||||
 | 
					        ],
 | 
				
			||||||
        ":windows": [],
 | 
					        ":windows": [],
 | 
				
			||||||
        "//conditions:default": ["-pthread"],
 | 
					        "//conditions:default": ["-pthread"],
 | 
				
			||||||
    }),
 | 
					    }),
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -80,6 +80,10 @@
 | 
				
			|||||||
# include <zircon/syscalls.h>
 | 
					# include <zircon/syscalls.h>
 | 
				
			||||||
#endif  // GTEST_OS_FUCHSIA
 | 
					#endif  // GTEST_OS_FUCHSIA
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#if GTEST_OS_IOS
 | 
				
			||||||
 | 
					#import <Foundation/Foundation.h>
 | 
				
			||||||
 | 
					#endif  // GTEST_OS_IOS
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "gtest/gtest-spi.h"
 | 
					#include "gtest/gtest-spi.h"
 | 
				
			||||||
#include "gtest/gtest-message.h"
 | 
					#include "gtest/gtest-message.h"
 | 
				
			||||||
#include "gtest/internal/gtest-internal.h"
 | 
					#include "gtest/internal/gtest-internal.h"
 | 
				
			||||||
@@ -1111,9 +1115,15 @@ class CapturedStream {
 | 
				
			|||||||
    // '/sdcard' and other variants cannot be relied on, as they are not
 | 
					    // '/sdcard' and other variants cannot be relied on, as they are not
 | 
				
			||||||
    // guaranteed to be mounted, or may have a delay in mounting.
 | 
					    // guaranteed to be mounted, or may have a delay in mounting.
 | 
				
			||||||
    char name_template[] = "/data/local/tmp/gtest_captured_stream.XXXXXX";
 | 
					    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
 | 
					#  else
 | 
				
			||||||
    char name_template[] = "/tmp/captured_stream.XXXXXX";
 | 
					    char name_template[] = "/tmp/captured_stream.XXXXXX";
 | 
				
			||||||
#  endif  // GTEST_OS_LINUX_ANDROID
 | 
					#  endif
 | 
				
			||||||
    const int captured_fd = mkstemp(name_template);
 | 
					    const int captured_fd = mkstemp(name_template);
 | 
				
			||||||
    if (captured_fd == -1) {
 | 
					    if (captured_fd == -1) {
 | 
				
			||||||
      GTEST_LOG_(WARNING)
 | 
					      GTEST_LOG_(WARNING)
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user