diff options
| author | Abseil Team <absl-team@google.com> | 2023-04-11 07:41:03 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2023-04-11 07:41:50 -0700 |
| commit | 7f6f9c12adefe8130565b7425dc387d284c009e4 (patch) | |
| tree | f08ce95cb97db2cb8203eee5bf0139d4fd2f6686 | |
| parent | 057b4e904fd754135dc19ff557c14036fd316425 (diff) | |
| download | googletest-git-7f6f9c12adefe8130565b7425dc387d284c009e4.tar.gz | |
Support --gtest_stream_result_to on macOS
This seems to just have been an oversight. POSIX socket APIs work just
fine on macOS.
Fixes https://github.com/google/googletest/issues/4214.
PiperOrigin-RevId: 523398386
Change-Id: I9d56cd9c6933318c1f0b0024f7fef44122fd0c83
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 2 | ||||
| -rwxr-xr-x | googletest/test/gtest_help_test.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h index 7846c9e1..656a2618 100644 --- a/googletest/include/gtest/internal/gtest-port.h +++ b/googletest/include/gtest/internal/gtest-port.h @@ -693,7 +693,7 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION; #if defined(GTEST_OS_LINUX) || defined(GTEST_OS_GNU_KFREEBSD) || \ defined(GTEST_OS_DRAGONFLY) || defined(GTEST_OS_FREEBSD) || \ defined(GTEST_OS_NETBSD) || defined(GTEST_OS_OPENBSD) || \ - defined(GTEST_OS_GNU_HURD) + defined(GTEST_OS_GNU_HURD) || defined(GTEST_OS_MAC) #define GTEST_CAN_STREAM_RESULTS_ 1 #else #define GTEST_CAN_STREAM_RESULTS_ 0 diff --git a/googletest/test/gtest_help_test.py b/googletest/test/gtest_help_test.py index fda40bff..9261b87a 100755 --- a/googletest/test/gtest_help_test.py +++ b/googletest/test/gtest_help_test.py @@ -43,6 +43,7 @@ import sys from googletest.test import gtest_test_utils +IS_DARWIN = os.name == 'posix' and os.uname()[0] == 'Darwin' IS_LINUX = os.name == 'posix' and os.uname()[0] == 'Linux' IS_GNUHURD = os.name == 'posix' and os.uname()[0] == 'GNU' IS_GNUKFREEBSD = os.name == 'posix' and os.uname()[0] == 'GNU/kFreeBSD' @@ -136,7 +137,7 @@ class GTestHelpTest(gtest_test_utils.TestCase): self.assertTrue(HELP_REGEX.search(output), output) - if IS_LINUX or IS_GNUHURD or IS_GNUKFREEBSD or IS_OPENBSD: + if IS_DARWIN or IS_LINUX or IS_GNUHURD or IS_GNUKFREEBSD or IS_OPENBSD: self.assertIn(STREAM_RESULT_TO_FLAG, output) else: self.assertNotIn(STREAM_RESULT_TO_FLAG, output) |