diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2017-12-01 16:31:29 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-01 16:31:29 -0500 |
| commit | c5cba7d17a928c18c61feb71db0d6a21ea1dc9db (patch) | |
| tree | 1ed3e1126478113dda0ab96b0d8fb78f84cf85f0 | |
| parent | 49eb76df471857fe1bd573b0636b1f9dd4fc8e4f (diff) | |
| parent | 247a3d8e5e5d403f7fcacdb8ccc71e5059f15daa (diff) | |
| download | googletest-c5cba7d17a928c18c61feb71db0d6a21ea1dc9db.tar.gz googletest-c5cba7d17a928c18c61feb71db0d6a21ea1dc9db.tar.bz2 googletest-c5cba7d17a928c18c61feb71db0d6a21ea1dc9db.zip | |
Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS
| -rw-r--r-- | googletest/src/gtest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index 9f52a8db..90eea805 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -2880,7 +2880,7 @@ enum GTestColor { }; #if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE && \ - !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT + !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT && !GTEST_OS_WINDOWS_MINGW // Returns the character attribute for the given color. WORD GetColorAttribute(GTestColor color) { @@ -2939,7 +2939,7 @@ bool ShouldUseColor(bool stdout_is_tty) { const char* const gtest_color = GTEST_FLAG(color).c_str(); if (String::CaseInsensitiveCStringEquals(gtest_color, "auto")) { -#if GTEST_OS_WINDOWS +#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MINGW // On Windows the TERM variable is usually not set, but the // console there does support colors. return stdout_is_tty; @@ -2997,7 +2997,7 @@ void ColoredPrintf(GTestColor color, const char* fmt, ...) { } #if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE && \ - !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT + !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT && !GTEST_OS_WINDOWS_MINGW const HANDLE stdout_handle = GetStdHandle(STD_OUTPUT_HANDLE); // Gets the current text color. |