diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-08 10:34:21 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-08 10:34:21 -0700 |
| commit | 61799bd5002bf0271b9fff6a28b8d0e9288acb00 (patch) | |
| tree | cb3ba6d3443f408bfa07512f1ed63d32ecfe908c | |
| parent | d5266326752f0a1dadbd310932d8f4fd8c3c5e7d (diff) | |
| parent | d31266e4ecf4f5df8bc2df38e5292fe4e56f1a7d (diff) | |
| download | googletest-61799bd5002bf0271b9fff6a28b8d0e9288acb00.tar.gz googletest-61799bd5002bf0271b9fff6a28b8d0e9288acb00.tar.bz2 googletest-61799bd5002bf0271b9fff6a28b8d0e9288acb00.zip | |
Merge pull request #1710 from gennadiycivil/master
Formatting Changes and small code merge
| -rw-r--r-- | googletest/src/gtest-death-test.cc | 3 | ||||
| -rw-r--r-- | googletest/src/gtest.cc | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/googletest/src/gtest-death-test.cc b/googletest/src/gtest-death-test.cc index 1cdfa2ef..564bcd27 100644 --- a/googletest/src/gtest-death-test.cc +++ b/googletest/src/gtest-death-test.cc @@ -237,6 +237,9 @@ static std::string DeathTestThreadWarning(size_t thread_count) { msg << "couldn't detect the number of threads."; else msg << "detected " << thread_count << " 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(); } # endif // !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index 9c25c997..bc66c978 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -3138,6 +3138,7 @@ void PrettyUnitTestResultPrinter::OnTestIterationStart( "Note: Randomizing tests' orders with a seed of %d .\n", unit_test.random_seed()); } + ColoredPrintf(COLOR_GREEN, "[==========] "); printf("Running %s from %s.\n", FormatTestCount(unit_test.test_to_run_count()).c_str(), |