summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925>2010-04-22 11:43:55 (GMT)
committervladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925>2010-04-22 11:43:55 (GMT)
commite85375608b87ffd48fbc9c9f1f2d9a58176d7055 (patch)
tree6a0f2967cd25025dc5a5835f98bebed01da9fc38
parent97c452823c6cf3cd28e8838cefcceb80da1c1ed7 (diff)
downloadgoogletest-e85375608b87ffd48fbc9c9f1f2d9a58176d7055.zip
googletest-e85375608b87ffd48fbc9c9f1f2d9a58176d7055.tar.gz
googletest-e85375608b87ffd48fbc9c9f1f2d9a58176d7055.tar.bz2
Fixes gtest-port_test on MinGW.
-rw-r--r--test/gtest-port_test.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/test/gtest-port_test.cc b/test/gtest-port_test.cc
index 3725860..b6e53ba 100644
--- a/test/gtest-port_test.cc
+++ b/test/gtest-port_test.cc
@@ -149,8 +149,10 @@ TEST(GtestCheckDeathTest, DiesWithCorrectOutputOnFailure) {
const char regex[] =
#ifdef _MSC_VER
"gtest-port_test\\.cc\\(\\d+\\):"
-#else
+#elif GTEST_USES_POSIX_RE
"gtest-port_test\\.cc:[0-9]+"
+#else
+ "gtest-port_test\\.cc:\\d+"
#endif // _MSC_VER
".*a_false_condition.*Extra info.*";