diff options
| author | Troels Gram <28827711+to01z@users.noreply.github.com> | 2024-03-29 05:05:08 (GMT) |
|---|---|---|
| committer | Troels Gram <28827711+to01z@users.noreply.github.com> | 2024-03-29 05:05:08 (GMT) |
| commit | a7678dd0db369dcb0110d83cfa5c9f9ba02f2423 (patch) | |
| tree | 35ed25291e8dc7aaf252c414255ae29fc8052d32 | |
| parent | f1269cc220734a5be8d68b370bf27efe6962bdb2 (diff) | |
| download | googletest-a7678dd0db369dcb0110d83cfa5c9f9ba02f2423.zip googletest-a7678dd0db369dcb0110d83cfa5c9f9ba02f2423.tar.gz googletest-a7678dd0db369dcb0110d83cfa5c9f9ba02f2423.tar.bz2 | |
Revert changes to googletest-port-test.ccrefs/pull/4505/head
GoogleTest's tests do not currently compile when WINAPI_FAMILY is set to
anything else than WINAPI_FAMILY_DESKTOP_APP on Windows (if WINAPI_FAMILY is not
set explicitly, it will default to WINAPI_FAMILY_DESKTOP_APP).
| -rw-r--r-- | googletest/test/googletest-port-test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/googletest/test/googletest-port-test.cc b/googletest/test/googletest-port-test.cc index 69d637b..9f05a01 100644 --- a/googletest/test/googletest-port-test.cc +++ b/googletest/test/googletest-port-test.cc @@ -918,7 +918,7 @@ TEST(RETest, PartialMatchWorks) { #endif // GTEST_USES_POSIX_RE -#if GTEST_HAS_STREAM_REDIRECTION +#ifndef GTEST_OS_WINDOWS_MOBILE TEST(CaptureTest, CapturesStdout) { CaptureStdout(); @@ -960,7 +960,7 @@ TEST(CaptureDeathTest, CannotReenterStdoutCapture) { // themselves. } -#endif // GTEST_HAS_STREAM_REDIRECTION +#endif // !GTEST_OS_WINDOWS_MOBILE TEST(ThreadLocalTest, DefaultConstructorInitializesToDefaultValues) { ThreadLocal<int> t1; |