diff options
| author | shiqian <shiqian@861a406c-534a-0410-8894-cb66d6ee9925> | 2008-07-09 20:58:26 +0000 |
|---|---|---|
| committer | shiqian <shiqian@861a406c-534a-0410-8894-cb66d6ee9925> | 2008-07-09 20:58:26 +0000 |
| commit | e0ecb7ac588e4061fe57207ff3734e465637b14d (patch) | |
| tree | 81afa87cb21e28946ccd96f22fce35c4158c6d51 /test/gtest_unittest.cc | |
| parent | e4e9a8bd7d2dbbad62030c8f80513e3c81b32213 (diff) | |
| download | googletest-e0ecb7ac588e4061fe57207ff3734e465637b14d.tar.gz googletest-e0ecb7ac588e4061fe57207ff3734e465637b14d.tar.bz2 googletest-e0ecb7ac588e4061fe57207ff3734e465637b14d.zip | |
Makes Google Test compile on Mac OS X and Cygwin, and adds project files for Microsoft Visual Studio.
Diffstat (limited to 'test/gtest_unittest.cc')
| -rw-r--r-- | test/gtest_unittest.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/test/gtest_unittest.cc b/test/gtest_unittest.cc index 9a64a13e..02799a4f 100644 --- a/test/gtest_unittest.cc +++ b/test/gtest_unittest.cc @@ -157,10 +157,12 @@ TEST(ToUtf8StringTest, CanEncode12To16Bits) { EXPECT_STREQ("\xEC\x9D\x8D", ToUtf8String(L'\xC74D').c_str()); } -#if !defined(GTEST_OS_WINDOWS) && !defined(__SYMBIAN32__) +#if !defined(GTEST_OS_WINDOWS) && !defined(GTEST_OS_CYGWIN) && \ + !defined(__SYMBIAN32__) // Tests in this group require a wchar_t to hold > 16 bits, and thus -// are skipped on Windows and Symbian, where a wchar_t is 16-bit wide. +// are skipped on Windows, Cygwin, and Symbian, where a wchar_t is +// 16-bit wide. // Tests that Unicode code-points that have 17 to 21 bits are encoded // as 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx. @@ -178,7 +180,7 @@ TEST(ToUtf8StringTest, CanEncodeInvalidCodePoint) { ToUtf8String(L'\x1234ABCD').c_str()); } -#endif // Windows or Symbian +#endif // Windows, Cygwin, or Symbian // Tests the List template class. |