diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-09-24 21:15:59 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-09-24 21:15:59 +0000 |
| commit | b50ef44a3527d958270ff1f08cb99e3ac633bd17 (patch) | |
| tree | ceb0f9819c41f511d74cf72066ec48620dea8caa /test/gtest-options_test.cc | |
| parent | 7fba282ce74ce527cba5c686945d18ae1b7cb3d2 (diff) | |
| download | googletest-b50ef44a3527d958270ff1f08cb99e3ac633bd17.tar.gz googletest-b50ef44a3527d958270ff1f08cb99e3ac633bd17.tar.bz2 googletest-b50ef44a3527d958270ff1f08cb99e3ac633bd17.zip | |
Publishes the even listener API (by Vlad Losev); adds OS-indicating macros to simplify gtest code (by Zhanyong Wan).
Diffstat (limited to 'test/gtest-options_test.cc')
| -rw-r--r-- | test/gtest-options_test.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/gtest-options_test.cc b/test/gtest-options_test.cc index 43c6d22d..31ae3277 100644 --- a/test/gtest-options_test.cc +++ b/test/gtest-options_test.cc @@ -40,11 +40,11 @@ #include <gtest/gtest.h> -#ifdef _WIN32_WCE +#if GTEST_OS_WINDOWS_MOBILE #include <windows.h> #elif GTEST_OS_WINDOWS #include <direct.h> -#endif // _WIN32_WCE +#endif // GTEST_OS_WINDOWS_MOBILE // Indicates that this translation unit is part of Google Test's // implementation. It must come before gtest-internal-inl.h is @@ -130,7 +130,7 @@ TEST(XmlOutputTest, GetOutputFileFromDirectoryPath) { TEST(OutputFileHelpersTest, GetCurrentExecutableName) { const FilePath executable = GetCurrentExecutableName(); const char* const exe_str = executable.c_str(); -#if defined(_WIN32_WCE) || GTEST_OS_WINDOWS +#if GTEST_OS_WINDOWS ASSERT_TRUE(_strcmpi("gtest-options_test", exe_str) == 0 || _strcmpi("gtest-options-ex_test", exe_str) == 0 || _strcmpi("gtest_all_test", exe_str) == 0) @@ -143,7 +143,7 @@ TEST(OutputFileHelpersTest, GetCurrentExecutableName) { String(exe_str) == "gtest_all_test" || String(exe_str) == "lt-gtest_all_test") << "GetCurrentExecutableName() returns " << exe_str; -#endif +#endif // GTEST_OS_WINDOWS } class XmlOutputChangeDirTest : public Test { |