Merge branch 'master' of https://github.com/google/googletest
diff --git a/googletest/src/gtest-death-test.cc b/googletest/src/gtest-death-test.cc
index 1cdfa2e..564bcd2 100644
--- a/googletest/src/gtest-death-test.cc
+++ b/googletest/src/gtest-death-test.cc
@@ -237,6 +237,9 @@
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 9c25c99..bc66c97 100644
--- a/googletest/src/gtest.cc
+++ b/googletest/src/gtest.cc
@@ -3138,6 +3138,7 @@
"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(),
