diff options
| author | Copybara-Service <copybara-worker@google.com> | 2022-06-13 08:38:29 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2022-06-13 08:38:29 -0700 |
| commit | b644b4fbbf07e35629b0daa44ec4110ddcbe2036 (patch) | |
| tree | 58536754b719aea9cb23a451ba6bda5205f8e99b | |
| parent | b1f84bf1763b1010597bff13c79b5388eebdf205 (diff) | |
| parent | 3727a9007512507e247fdab69c62e039f29ff80b (diff) | |
| download | googletest-git-b644b4fbbf07e35629b0daa44ec4110ddcbe2036.tar.gz | |
Merge pull request #3866 from eidosmontreal:simplify_shouldusecolor
PiperOrigin-RevId: 454616721
Change-Id: I33b5671646ec027da48cc941baf84b4ddc722e07
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 3 | ||||
| -rw-r--r-- | googletest/src/gtest.cc | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h index 7162e6e1..e52d8a78 100644 --- a/googletest/include/gtest/internal/gtest-port.h +++ b/googletest/include/gtest/internal/gtest-port.h @@ -1965,7 +1965,8 @@ inline int StrCaseCmp(const char* s1, const char* s2) { } inline char* StrDup(const char* src) { return strdup(src); } #else // !__BORLANDC__ -#if GTEST_OS_WINDOWS_MOBILE +#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_ZOS || GTEST_OS_IOS || \ + GTEST_OS_WINDOWS_PHONE || GTEST_OS_WINDOWS_RT || defined(ESP_PLATFORM) inline int DoIsATTY(int /* fd */) { return 0; } #else inline int DoIsATTY(int fd) { return _isatty(fd); } diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index 1acad59a..6f31dd22 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -3278,14 +3278,9 @@ static void ColoredPrintf(GTestColor color, const char* fmt, ...) { va_list args; va_start(args, fmt); -#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_ZOS || GTEST_OS_IOS || \ - GTEST_OS_WINDOWS_PHONE || GTEST_OS_WINDOWS_RT || defined(ESP_PLATFORM) - const bool use_color = AlwaysFalse(); -#else static const bool in_color_mode = ShouldUseColor(posix::IsATTY(posix::FileNo(stdout)) != 0); const bool use_color = in_color_mode && (color != GTestColor::kDefault); -#endif // GTEST_OS_WINDOWS_MOBILE || GTEST_OS_ZOS if (!use_color) { vprintf(fmt, args); |