diff options
| author | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-03-11 18:31:26 (GMT) |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925> | 2009-03-11 18:31:26 (GMT) |
| commit | 44a041b711ff4a5b5f341f21127aed46dbfe38ad (patch) | |
| tree | 75fea96237260f31783dea6238355501dd6e32fd /src | |
| parent | 40e72a8a837b47cbfe2e695068c1845073ab2630 (diff) | |
| download | googletest-44a041b711ff4a5b5f341f21127aed46dbfe38ad.zip googletest-44a041b711ff4a5b5f341f21127aed46dbfe38ad.tar.gz googletest-44a041b711ff4a5b5f341f21127aed46dbfe38ad.tar.bz2 | |
Fixes death-test-related tests on Windows, by Vlad Losev.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gtest-internal-inl.h | 7 | ||||
| -rw-r--r-- | src/gtest-typed-test.cc | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/gtest-internal-inl.h b/src/gtest-internal-inl.h index de5124d..d079a3e 100644 --- a/src/gtest-internal-inl.h +++ b/src/gtest-internal-inl.h @@ -49,16 +49,17 @@ #include <stddef.h> #include <stdlib.h> // For strtoll/_strtoul64. +#include <string> + +#include <gtest/internal/gtest-port.h> + #if GTEST_OS_WINDOWS #include <windows.h> // For DWORD. #endif // GTEST_OS_WINDOWS -#include <gtest/internal/gtest-port.h> #include <gtest/gtest.h> #include <gtest/gtest-spi.h> -#include <string> - namespace testing { // Declares the flags. diff --git a/src/gtest-typed-test.cc b/src/gtest-typed-test.cc index cb91f2b..e45e2ab 100644 --- a/src/gtest-typed-test.cc +++ b/src/gtest-typed-test.cc @@ -85,6 +85,7 @@ const char* TypedTestCasePState::VerifyRegisteredTestNames( if (errors_str != "") { fprintf(stderr, "%s %s", FormatFileLocation(file, line).c_str(), errors_str.c_str()); + fflush(stderr); abort(); } |