summaryrefslogtreecommitdiffstats
path: root/googletest/src/gtest-death-test.cc
diff options
context:
space:
mode:
authorAbseil Team <absl-team@google.com>2021-04-06 21:14:56 (GMT)
committerDino Radaković <dinor@google.com>2021-04-08 06:39:18 (GMT)
commit601a68150d699e5530886bcb260b99622a4fe07a (patch)
treefd4e46f4c65b89b83ed75a2307f4cbf933a53e67 /googletest/src/gtest-death-test.cc
parent54689b19356af73978af605ef5c4e2b090ef9d2b (diff)
downloadgoogletest-601a68150d699e5530886bcb260b99622a4fe07a.zip
googletest-601a68150d699e5530886bcb260b99622a4fe07a.tar.gz
googletest-601a68150d699e5530886bcb260b99622a4fe07a.tar.bz2
Googletest export
This is part of a soft transition over to having ZX_INFO_PROCESS populate a new struct. See fxbug.dev/30751 for more details. PiperOrigin-RevId: 367083068
Diffstat (limited to 'googletest/src/gtest-death-test.cc')
-rw-r--r--googletest/src/gtest-death-test.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/googletest/src/gtest-death-test.cc b/googletest/src/gtest-death-test.cc
index c3d6dfc..cbc395b 100644
--- a/googletest/src/gtest-death-test.cc
+++ b/googletest/src/gtest-death-test.cc
@@ -953,12 +953,12 @@ int FuchsiaDeathTest::Wait() {
ReadAndInterpretStatusByte();
- zx_info_process_t buffer;
+ zx_info_process_v2_t buffer;
status_zx = child_process_.get_info(
- ZX_INFO_PROCESS, &buffer, sizeof(buffer), nullptr, nullptr);
+ ZX_INFO_PROCESS_V2, &buffer, sizeof(buffer), nullptr, nullptr);
GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK);
- GTEST_DEATH_TEST_CHECK_(buffer.exited);
+ GTEST_DEATH_TEST_CHECK_(buffer.flags & ZX_INFO_PROCESS_FLAG_EXITED);
set_status(buffer.return_code);
return status();
}