Commit 54cb8b02 authored by Gennadiy Civil's avatar Gennadiy Civil
Browse files

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

parents f7042937 d5b31df9
...@@ -244,8 +244,7 @@ static std::string DeathTestThreadWarning(size_t thread_count) { ...@@ -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';
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment