eson/googletest
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/google/googletest

Browse Source 
Formatting changes and code sync
Merge branch 'master' of https://github.com/google/googletest
This commit is contained in:
Gennadiy Civil 2018-08-08 13:20:02 -04:00
parent 41e82cadf4
commit bdf5fd3a98
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
googletest/src/gtest-death-test.cc
View File

@ -237,6 +237,9 @@ static std::string DeathTestThreadWarning(size_t thread_count) {
msg << "couldn't detect the number of threads."; msg << "couldn't detect the number of threads.";
else else
msg << "detected " << thread_count << " threads."; 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(); return msg.GetString();
} }
# endif // !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA # endif // !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA
@ -900,7 +903,7 @@ int FuchsiaDeathTest::Wait() {
} else { } else {
// Process terminated. // Process terminated.
GTEST_DEATH_TEST_CHECK_(ZX_PKT_IS_SIGNAL_ONE(packet.type)); GTEST_DEATH_TEST_CHECK_(ZX_PKT_IS_SIGNAL_ONE(packet.type));
GTEST_DEATH_TEST_CHECK_(packet.observed & ZX_PROCESS_TERMINATED); GTEST_DEATH_TEST_CHECK_(packet.signal.observed & ZX_PROCESS_TERMINATED);
} }
ReadAndInterpretStatusByte(); ReadAndInterpretStatusByte();

1
googletest/src/gtest.cc
View File

@ -3138,6 +3138,7 @@ void PrettyUnitTestResultPrinter::OnTestIterationStart(
"Note: Randomizing tests' orders with a seed of %d .\n", "Note: Randomizing tests' orders with a seed of %d .\n",
unit_test.random_seed()); unit_test.random_seed());
} }
ColoredPrintf(COLOR_GREEN, "[==========] "); ColoredPrintf(COLOR_GREEN, "[==========] ");
printf("Running %s from %s.\n", printf("Running %s from %s.\n",
FormatTestCount(unit_test.test_to_run_count()).c_str(), FormatTestCount(unit_test.test_to_run_count()).c_str(),