diff options
| author | vladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925> | 2010-04-22 11:43:55 +0000 |
|---|---|---|
| committer | vladlosev <vladlosev@861a406c-534a-0410-8894-cb66d6ee9925> | 2010-04-22 11:43:55 +0000 |
| commit | edea1b14488a67ca7cbc11545a35250e2492da9f (patch) | |
| tree | 6a0f2967cd25025dc5a5835f98bebed01da9fc38 | |
| parent | 0ce424bbe0eed43e66709712da295232c759ec7a (diff) | |
| download | googletest-edea1b14488a67ca7cbc11545a35250e2492da9f.tar.gz | |
Fixes gtest-port_test on MinGW.
git-svn-id: http://googletest.googlecode.com/svn/trunk@420 861a406c-534a-0410-8894-cb66d6ee9925
| -rw-r--r-- | test/gtest-port_test.cc | 4 |
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.*"; |