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).
This commit is contained in:
parent
f1269cc220
commit
a7678dd0db
@ -918,7 +918,7 @@ TEST(RETest, PartialMatchWorks) {
|
|||||||
|
|
||||||
#endif // GTEST_USES_POSIX_RE
|
#endif // GTEST_USES_POSIX_RE
|
||||||
|
|
||||||
#if GTEST_HAS_STREAM_REDIRECTION
|
#ifndef GTEST_OS_WINDOWS_MOBILE
|
||||||
|
|
||||||
TEST(CaptureTest, CapturesStdout) {
|
TEST(CaptureTest, CapturesStdout) {
|
||||||
CaptureStdout();
|
CaptureStdout();
|
||||||
@ -960,7 +960,7 @@ TEST(CaptureDeathTest, CannotReenterStdoutCapture) {
|
|||||||
// themselves.
|
// themselves.
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // GTEST_HAS_STREAM_REDIRECTION
|
#endif // !GTEST_OS_WINDOWS_MOBILE
|
||||||
|
|
||||||
TEST(ThreadLocalTest, DefaultConstructorInitializesToDefaultValues) {
|
TEST(ThreadLocalTest, DefaultConstructorInitializesToDefaultValues) {
|
||||||
ThreadLocal<int> t1;
|
ThreadLocal<int> t1;
|
||||||
|
Loading…
Reference in New Issue
Block a user