Merge pull request #1843 from matlo607/fix-unittest-msys-ColoredOutputTest

[msys] fix unittest ColoredOutputTest.UsesColorsWhenTermSupportsColors
2018-09-20 11:42:29 -04:00
parent 09560fba44 c9fe337ae2
commit 8bf297233f
2 changed files with 4 additions and 3 deletions
--- a/googletest/test/gtest_unittest.cc
+++ b/googletest/test/gtest_unittest.cc
@@ -6826,7 +6826,7 @@ TEST(ColoredOutputTest, UsesColorsWhenStdoutIsTty) {
 TEST(ColoredOutputTest, UsesColorsWhenTermSupportsColors) {
  GTEST_FLAG(color) = "auto";

-#if GTEST_OS_WINDOWS
+#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MINGW
  // On Windows, we ignore the TERM variable as it's usually not set.

  SetEnv("TERM", "dumb");