From a7678dd0db369dcb0110d83cfa5c9f9ba02f2423 Mon Sep 17 00:00:00 2001 From: Troels Gram <28827711+to01z@users.noreply.github.com> Date: Thu, 28 Mar 2024 22:05:08 -0700 Subject: [PATCH] Revert changes to googletest-port-test.cc 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). --- googletest/test/googletest-port-test.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/googletest/test/googletest-port-test.cc b/googletest/test/googletest-port-test.cc index 69d637bd..9f05a019 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 t1;