diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-03-17 21:03:35 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-03-17 21:03:35 +0000 |
| commit | 9623aed82cf3e0dcd2fb2fb7442a5a9507ac55a5 (patch) | |
| tree | 546adb028be5895120f443878b06482c68f96dfc /include/gtest/internal | |
| parent | 62f8d28c0bd5cb057013fdf5b366db7b7981ec4c (diff) | |
| download | googletest-9623aed82cf3e0dcd2fb2fb7442a5a9507ac55a5.tar.gz googletest-9623aed82cf3e0dcd2fb2fb7442a5a9507ac55a5.tar.bz2 googletest-9623aed82cf3e0dcd2fb2fb7442a5a9507ac55a5.zip | |
Enables death tests on Cygwin and Mac (by Vlad Losev); fixes a python test on Mac.
Diffstat (limited to 'include/gtest/internal')
| -rw-r--r-- | include/gtest/internal/gtest-port.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/gtest/internal/gtest-port.h b/include/gtest/internal/gtest-port.h index 5d22f24f..11798a1a 100644 --- a/include/gtest/internal/gtest-port.h +++ b/include/gtest/internal/gtest-port.h @@ -376,12 +376,13 @@ // (this is covered by GTEST_HAS_STD_STRING guard). // 3. abort() in a VC 7.1 application compiled as GUI in debug config // pops up a dialog window that cannot be suppressed programmatically. -#if GTEST_HAS_STD_STRING && (GTEST_HAS_CLONE || \ - GTEST_OS_WINDOWS && _MSC_VER >= 1400) +#if GTEST_HAS_STD_STRING && (GTEST_OS_LINUX || \ + GTEST_OS_MAC || \ + GTEST_OS_CYGWIN || \ + (GTEST_OS_WINDOWS && _MSC_VER >= 1400)) #define GTEST_HAS_DEATH_TEST 1 #include <vector> -#endif // GTEST_HAS_STD_STRING && (GTEST_HAS_CLONE || - // GTEST_OS_WINDOWS && _MSC_VER >= 1400) +#endif // Determines whether to support value-parameterized tests. |