diff options
| author | Gaspard Petit <gpetit@eidosmontreal.com> | 2022-05-30 13:34:17 -0400 |
|---|---|---|
| committer | Gaspard Petit <gpetit@eidosmontreal.com> | 2022-05-30 14:19:50 -0400 |
| commit | 59006287cd4f8c239eaa0f23852eef2b57d93da3 (patch) | |
| tree | 79163441763efa521c82ad1729346f2f101fd51e | |
| parent | 9d21db9e0a60a1ea61ec19331c9bc0dd33e907b1 (diff) | |
| download | googletest-59006287cd4f8c239eaa0f23852eef2b57d93da3.zip googletest-59006287cd4f8c239eaa0f23852eef2b57d93da3.tar.gz googletest-59006287cd4f8c239eaa0f23852eef2b57d93da3.tar.bz2 | |
Simplify ColoredPrintf to rely on ShouldUseColor
Use ShouldUseColor to set use_color instead of having a separate check for the windows mobile cases; these cases are now moved directly to `DoIsATTY`
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port.h | 3 | ||||
| -rw-r--r-- | googletest/src/gtest.cc | 8 |
2 files changed, 3 insertions, 8 deletions
diff --git a/googletest/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h index 7162e6e..e52d8a7 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 1acad59..54aae93 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -3278,14 +3278,8 @@ 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); + 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); |