commit d9dc73a1ac9e4e39f9da5d19277d17f6c1c1bdee
author Andreas Gampe <agampe@google.com> Fri Jun 23 05:43:02 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jun 23 05:43:02 2017 +0000
tree 8eb9060956242179242f3a3817d7be8707feb26a
parent d76f15113370b62605aa97c8f9345a1d1a9d7d82
parent e712340ef0a3d835d0978110c76effbfbda6b0df

Merge "Debuggerd: Fix debuggerd_test" am: 0c65c5c856 am: fb3a6e2391 am: 067e0f0d85
am: f8511fd05a

Change-Id: I3c35c7b0f5fabdd731c5e27866daf355f2133ff5

debuggerd/debuggerd_test.cpp

diff --git a/debuggerd/debuggerd_test.cpp b/debuggerd/debuggerd_test.cpp
index 4660f3d..b51fc66 100644
--- a/debuggerd/debuggerd_test.cpp
+++ b/debuggerd/debuggerd_test.cpp
@@ -311,7 +311,7 @@
 
   std::string result;
   ConsumeFd(std::move(output_fd), &result);
-  ASSERT_BACKTRACE_FRAME(result, "tgkill");
+  ASSERT_BACKTRACE_FRAME(result, "abort");
 }
 
 TEST_F(CrasherTest, signal) {
@@ -458,7 +458,7 @@
   FinishIntercept(&intercept_result);
   ASSERT_EQ(1, intercept_result) << "tombstoned reported failure";
   ConsumeFd(std::move(output_fd), &result);
-  ASSERT_BACKTRACE_FRAME(result, "tgkill");
+  ASSERT_BACKTRACE_FRAME(result, "abort");
 }
 
 TEST_F(CrasherTest, PR_SET_DUMPABLE_0_crash) {
@@ -478,7 +478,7 @@
 
   std::string result;
   ConsumeFd(std::move(output_fd), &result);
-  ASSERT_BACKTRACE_FRAME(result, "tgkill");
+  ASSERT_BACKTRACE_FRAME(result, "abort");
 }
 
 TEST_F(CrasherTest, capabilities) {