diff options
| author | Abseil Team <absl-team@google.com> | 2019-02-19 12:39:01 -0500 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2019-02-20 13:35:30 -0500 |
| commit | 0e424c7594dd145188267c82db19f0e478df192d (patch) | |
| tree | 779190b0b103ecb5423a9db81bd19dbbdf4fb3f4 | |
| parent | 6d4d2f06bebcbaa36a60d7d1c6934efbfaf2db95 (diff) | |
| download | googletest-0e424c7594dd145188267c82db19f0e478df192d.tar.gz | |
Googletest export
Update gtest-death-test to use new Fuchsia API
Fuchsia has renamed this API and removed the need for several parameters. We now use the newer, simpler API.
PiperOrigin-RevId: 234617715
| -rw-r--r-- | googletest/src/gtest-death-test.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/googletest/src/gtest-death-test.cc b/googletest/src/gtest-death-test.cc index 9bdfdea4..d15e250b 100644 --- a/googletest/src/gtest-death-test.cc +++ b/googletest/src/gtest-death-test.cc @@ -65,12 +65,12 @@ # endif // GTEST_OS_QNX # if GTEST_OS_FUCHSIA +# include <lib/fdio/fd.h> # include <lib/fdio/io.h> # include <lib/fdio/spawn.h> -# include <lib/fdio/util.h> -# include <lib/zx/socket.h> # include <lib/zx/port.h> # include <lib/zx/process.h> +# include <lib/zx/socket.h> # include <zircon/processargs.h> # include <zircon/syscalls.h> # include <zircon/syscalls/policy.h> @@ -1006,10 +1006,8 @@ DeathTest::TestRole FuchsiaDeathTest::AssumeRole() { zx::socket::create(0, &stderr_producer_socket, &stderr_socket_); GTEST_DEATH_TEST_CHECK_(status >= 0); int stderr_producer_fd = -1; - zx_handle_t producer_handle[1] = { stderr_producer_socket.release() }; - uint32_t producer_handle_type[1] = { PA_FDIO_SOCKET }; - status = fdio_create_fd( - producer_handle, producer_handle_type, 1, &stderr_producer_fd); + status = + fdio_fd_create(stderr_producer_socket.release(), &stderr_producer_fd); GTEST_DEATH_TEST_CHECK_(status >= 0); // Make the stderr socket nonblocking. |