diff options
author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-09 09:11:18 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-09 09:11:18 -0700 |
commit | 33596cb5c3cd4580560bef449b22e4e5e8c1007d (patch) | |
tree | 803b7b02bd7e23f7171416f01a876acf0fc163a7 | |
parent | 2797ba8f917b97b08fc83cbb31d4c953e54a6b77 (diff) | |
parent | 7a79459a663ce98a31fdbb14dea9a750bc285885 (diff) | |
download | googletest-33596cb5c3cd4580560bef449b22e4e5e8c1007d.tar.gz googletest-33596cb5c3cd4580560bef449b22e4e5e8c1007d.tar.bz2 googletest-33596cb5c3cd4580560bef449b22e4e5e8c1007d.zip |
Merge pull request #1721 from gennadiycivil/master
Fixing identation, causes build errors when warnings are treated as errors
-rw-r--r-- | googletest/src/gtest-death-test.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/googletest/src/gtest-death-test.cc b/googletest/src/gtest-death-test.cc index 564bcd27..854bc467 100644 --- a/googletest/src/gtest-death-test.cc +++ b/googletest/src/gtest-death-test.cc @@ -233,11 +233,14 @@ static std::string DeathTestThreadWarning(size_t thread_count) { Message msg; msg << "Death tests use fork(), which is unsafe particularly" << " in a threaded context. For this test, " << GTEST_NAME_ << " "; - if (thread_count == 0) + if (thread_count == 0) { msg << "couldn't detect the number of threads."; - else + } else { msg << "detected " << thread_count << " threads."; - msg << " See https://github.com/google/googletest/blob/master/googletest/docs/advanced.md#death-tests-and-threads" + } + msg << " See " + "https://github.com/google/googletest/blob/master/googletest/docs/" + "advanced.md#death-tests-and-threads" << " for more explanation and suggested solutions, especially if" << " this is the last message you see before your test times out."; return msg.GetString(); |