diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-09-30 23:46:28 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-09-30 23:46:28 +0000 |
| commit | bd851333e89517762c91a3fef67cf25a6f1bd37a (patch) | |
| tree | 9b23d718046f2e83236287dca1ad8a7c863a47e5 /include/gtest/internal/gtest-port.h | |
| parent | f8b268ee86ca74bba3276352f1e7de53d1336c3e (diff) | |
| download | googletest-bd851333e89517762c91a3fef67cf25a6f1bd37a.tar.gz googletest-bd851333e89517762c91a3fef67cf25a6f1bd37a.tar.bz2 googletest-bd851333e89517762c91a3fef67cf25a6f1bd37a.zip | |
Implements test shuffling (by Zhanyong Wan, based on Josh Kelley's original patch).
Enables death tests on minGW (by Vlad Losev).
Diffstat (limited to 'include/gtest/internal/gtest-port.h')
| -rw-r--r-- | include/gtest/internal/gtest-port.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/gtest/internal/gtest-port.h b/include/gtest/internal/gtest-port.h index ac460eee..ee97881f 100644 --- a/include/gtest/internal/gtest-port.h +++ b/include/gtest/internal/gtest-port.h @@ -461,7 +461,7 @@ // pops up a dialog window that cannot be suppressed programmatically. #if GTEST_HAS_STD_STRING && \ (GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_CYGWIN || \ - (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400)) + (GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || GTEST_OS_WINDOWS_MINGW) #define GTEST_HAS_DEATH_TEST 1 #include <vector> // NOLINT #endif |