Merge branch 'master' of github.com:gennadiycivil/googletest

This commit is contained in:
Gennadiy Civil 2018-08-09 11:54:12 -04:00
commit 54cb8b0238

View File

@ -244,8 +244,7 @@ static std::string DeathTestThreadWarning(size_t thread_count) {
<< " for more explanation and suggested solutions, especially if" << " for more explanation and suggested solutions, especially if"
<< " this is the last message you see before your test times out."; << " this is the last message you see before your test times out.";
return msg.GetString(); return msg.GetString();
} }# endif // !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
# endif // !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
// Flag characters for reporting a death test that did not die. // Flag characters for reporting a death test that did not die.
static const char kDeathTestLived = 'L'; static const char kDeathTestLived = 'L';