aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2009-03-11 18:31:26 +0000
committerzhanyong.wan <zhanyong.wan@861a406c-534a-0410-8894-cb66d6ee9925>2009-03-11 18:31:26 +0000
commit44a041b711ff4a5b5f341f21127aed46dbfe38ad (patch)
tree75fea96237260f31783dea6238355501dd6e32fd /include
parent40e72a8a837b47cbfe2e695068c1845073ab2630 (diff)
downloadgoogletest-44a041b711ff4a5b5f341f21127aed46dbfe38ad.tar.gz
googletest-44a041b711ff4a5b5f341f21127aed46dbfe38ad.tar.bz2
googletest-44a041b711ff4a5b5f341f21127aed46dbfe38ad.zip
Fixes death-test-related tests on Windows, by Vlad Losev.
Diffstat (limited to 'include')
-rw-r--r--include/gtest/internal/gtest-internal.h1
-rw-r--r--include/gtest/internal/gtest-port.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/include/gtest/internal/gtest-internal.h b/include/gtest/internal/gtest-internal.h
index 5908b760..f61d502f 100644
--- a/include/gtest/internal/gtest-internal.h
+++ b/include/gtest/internal/gtest-internal.h
@@ -616,6 +616,7 @@ class TypedTestCasePState {
fprintf(stderr, "%s Test %s must be defined before "
"REGISTER_TYPED_TEST_CASE_P(%s, ...).\n",
FormatFileLocation(file, line).c_str(), test_name, case_name);
+ fflush(stderr);
abort();
}
defined_test_names_.insert(test_name);
diff --git a/include/gtest/internal/gtest-port.h b/include/gtest/internal/gtest-port.h
index c93ebd8a..0b4e7211 100644
--- a/include/gtest/internal/gtest-port.h
+++ b/include/gtest/internal/gtest-port.h
@@ -198,7 +198,7 @@
// simple regex implementation instead.
#define GTEST_USES_SIMPLE_RE 1
-#endif // GTEST_OS_LINUX
+#endif // GTEST_OS_CYGWIN || GTEST_OS_LINUX || GTEST_OS_MAC
// Defines GTEST_HAS_EXCEPTIONS to 1 if exceptions are enabled, or 0
// otherwise.