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

Formatting changes and code sync
Merge branch 'master' of https://github.com/google/googletest

1 files changed, 4 insertions, 1 deletions

diff --git a/googletest/src/gtest-death-test.cc b/googletest/src/gtest-death-test.cc
index 8ae9968..564bcd2 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();