From 02a3bf6e27128dfba46607021a8a43edd8986aff Mon Sep 17 00:00:00 2001 From: Scott Graham Date: Tue, 7 May 2019 09:49:30 -0700 Subject: [PATCH] fuchsia: Tidy up return ZX_TASK_RETCODE_EXCEPTION_KILL after soft transition Bug: fuchsia:ZX-3473 Change-Id: Iad57d46e6eaffea96f276ce0e73ea87e812b488c Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/1599728 Reviewed-by: Joshua Peraza Commit-Queue: Scott Graham --- test/multiprocess_exec_fuchsia.cc | 7 ------- 1 file changed, 7 deletions(-) diff --git a/test/multiprocess_exec_fuchsia.cc b/test/multiprocess_exec_fuchsia.cc index eff522b0..f91b3edc 100644 --- a/test/multiprocess_exec_fuchsia.cc +++ b/test/multiprocess_exec_fuchsia.cc @@ -95,14 +95,7 @@ void Multiprocess::SetExpectedChildTermination(TerminationReason reason, } void Multiprocess::SetExpectedChildTerminationBuiltinTrap() { - // TODO(scottmg): Once - // https://fuchsia-review.googlesource.com/c/fuchsia/+/256771 lands, remove - // this #ifdef, and always use ZX_TASK_RETCODE_EXCEPTION_KILL. -#if defined(ZX_TASK_RETCODE_EXCEPTION_KILL) constexpr ReturnCodeType kExpectedReturnCode = ZX_TASK_RETCODE_EXCEPTION_KILL; -#else - constexpr ReturnCodeType kExpectedReturnCode = -1; -#endif SetExpectedChildTermination(kTerminationNormal, kExpectedReturnCode); }