commit 0183a459e5014f8c81dda27bee643da3b07554d6
author Gennadiy Civil <misterg@google.com> Fri Jun 07 13:06:50 2019 -0400
committer Gennadiy Civil <misterg@google.com> Fri Jun 07 13:06:50 2019 -0400
tree daed3e0afef073a2dcc2301e9e64a05051e3479a
parent 31200def0dec8a624c861f919e86e4444e6e6ee7
parent 711fccf8317b4fb7adc21c00fc1e20823c5d875f

Merge pull request #2270 from Peter-Levine:fix-signed-wchar

PiperOrigin-RevId: 251713108

googletest/include/gtest/gtest.h

diff --git a/googletest/include/gtest/gtest.h b/googletest/include/gtest/gtest.h
index 7382442..0cb5a2e 100644
--- a/googletest/include/gtest/gtest.h
+++ b/googletest/include/gtest/gtest.h
@@ -414,7 +414,7 @@
   // class.
   static void SetUpTestSuite() {}
 
-  // Tears down the stuff shared by all tests in this test case.
+  // Tears down the stuff shared by all tests in this test suite.
   //
   // Google Test will call Foo::TearDownTestSuite() after running the last
   // test in test case Foo.  Hence a sub-class can define its own

googletest/src/gtest-death-test.cc

diff --git a/googletest/src/gtest-death-test.cc b/googletest/src/gtest-death-test.cc
index 9bfe315..350e610 100644
--- a/googletest/src/gtest-death-test.cc
+++ b/googletest/src/gtest-death-test.cc
@@ -993,7 +993,7 @@
   zx_status_t status;
   zx_handle_t child_pipe_handle;
   int child_pipe_fd;
-  status = fdio_pipe_half2(&child_pipe_fd, &child_pipe_handle);
+  status = fdio_pipe_half(&child_pipe_fd, &child_pipe_handle);
   GTEST_DEATH_TEST_CHECK_(status == ZX_OK);
   set_read_fd(child_pipe_fd);