diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-08-08 13:20:02 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-08-08 13:20:02 -0400 |
| commit | bdf5fd3a98942f57385c8977dab965874d3c5d53 (patch) | |
| tree | cb3ba6d3443f408bfa07512f1ed63d32ecfe908c | |
| parent | 41e82cadf42d59c258473883073cdb4334abbc59 (diff) | |
| download | googletest-bdf5fd3a98942f57385c8977dab965874d3c5d53.tar.gz googletest-bdf5fd3a98942f57385c8977dab965874d3c5d53.tar.bz2 googletest-bdf5fd3a98942f57385c8977dab965874d3c5d53.zip | |
Merge branch 'master' of https://github.com/google/googletest
Formatting changes and code sync
Merge branch 'master' of https://github.com/google/googletest
| -rw-r--r-- | googletest/src/gtest-death-test.cc | 5 | ||||
| -rw-r--r-- | googletest/src/gtest.cc | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/googletest/src/gtest-death-test.cc b/googletest/src/gtest-death-test.cc index 8ae9968d..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 @@ -900,7 +903,7 @@ int FuchsiaDeathTest::Wait() { } else { // Process terminated. 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(); 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(), |