diff options
| author | Matthieu Longo <mateo.longo@gmail.com> | 2018-09-17 18:17:10 +0200 |
|---|---|---|
| committer | Matthieu Longo <matthieu.longo@murex.com> | 2018-09-18 18:29:42 +0200 |
| commit | c9fe337ae255baac2c72b4a1099bbad4e181a3a8 (patch) | |
| tree | b3053073868cd21a3bb4f47914973a845f827924 | |
| parent | bc2d0935b74917be0821bfd834472ed9cc4a3b5b (diff) | |
| download | googletest-c9fe337ae255baac2c72b4a1099bbad4e181a3a8.tar.gz googletest-c9fe337ae255baac2c72b4a1099bbad4e181a3a8.tar.bz2 googletest-c9fe337ae255baac2c72b4a1099bbad4e181a3a8.zip | |
[msys] fix unittest ColoredOutputTest.UsesColorsWhenTermSupportsColors
| -rw-r--r-- | googletest/include/gtest/internal/gtest-port-arch.h | 5 | ||||
| -rw-r--r-- | googletest/test/gtest_unittest.cc | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/googletest/include/gtest/internal/gtest-port-arch.h b/googletest/include/gtest/internal/gtest-port-arch.h index f83700e0..587ed5e5 100644 --- a/googletest/include/gtest/internal/gtest-port-arch.h +++ b/googletest/include/gtest/internal/gtest-port-arch.h @@ -38,14 +38,15 @@ // Determines the platform on which Google Test is compiled. #ifdef __CYGWIN__ # define GTEST_OS_CYGWIN 1 +# elif defined(__MINGW__) || defined(__MINGW32__) || defined(__MINGW64__) +# define GTEST_OS_WINDOWS_MINGW 1 +# define GTEST_OS_WINDOWS 1 #elif defined __SYMBIAN32__ # define GTEST_OS_SYMBIAN 1 #elif defined _WIN32 # define GTEST_OS_WINDOWS 1 # ifdef _WIN32_WCE # define GTEST_OS_WINDOWS_MOBILE 1 -# elif defined(__MINGW__) || defined(__MINGW32__) -# define GTEST_OS_WINDOWS_MINGW 1 # elif defined(WINAPI_FAMILY) # include <winapifamily.h> # if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) diff --git a/googletest/test/gtest_unittest.cc b/googletest/test/gtest_unittest.cc index 701ba204..c03b3671 100644 --- 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"); |