From: Copybara-Service <copybara-worker@google.com>
Date: Mon, 13 Jun 2022 15:38:29 +0000 (-0700)
Subject: Merge pull request #3866 from eidosmontreal:simplify_shouldusecolor
X-Git-Tag: release-1.12.0~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b644b4fbbf07e35629b0daa44ec4110ddcbe2036;p=googletest.git

Merge pull request #3866 from eidosmontreal:simplify_shouldusecolor

PiperOrigin-RevId: 454616721
Change-Id: I33b5671646ec027da48cc941baf84b4ddc722e07
---

b644b4fbbf07e35629b0daa44ec4110ddcbe2036
diff --cc googletest/src/gtest.cc
index 1acad59,54aae93..6f31dd2
--- a/googletest/src/gtest.cc
+++ b/googletest/src/gtest.cc
@@@ -3278,14 -3278,8 +3278,9 @@@ static void ColoredPrintf(GTestColor co
    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);