]> git-server-git.apps.pok.os.sepia.ceph.com Git - googletest.git/commitdiff
Merge pull request #3866 from eidosmontreal:simplify_shouldusecolor
authorCopybara-Service <copybara-worker@google.com>
Mon, 13 Jun 2022 15:38:29 +0000 (08:38 -0700)
committerCopybara-Service <copybara-worker@google.com>
Mon, 13 Jun 2022 15:38:29 +0000 (08:38 -0700)
PiperOrigin-RevId: 454616721
Change-Id: I33b5671646ec027da48cc941baf84b4ddc722e07

1  2 
googletest/src/gtest.cc

index 1acad59a73ecc2e8a580bf75b9f77ef5e9e31331,54aae939686ab8ce44ccecb6114e571e7d26abf5..6f31dd22603340a2006d3eb8755df5ea7d414733
@@@ -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);