commit f61da6b6e034d9cb74f10d152823745f1aaeebb6
author Andreas Gampe <agampe@google.com> Fri Jun 23 05:25:57 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jun 23 05:25:57 2017 +0000
tree 2e43580d316d1c73c518606dec29d3d7afdcb79b
parent 09af88604c6a2c14f89c2a01288a481761327871
parent 17281e3c2aa2c93445ad254316d032c00da45bd4

Merge "Debuggerd: Fix debuggerd_test" am: 0c65c5c856
am: fb3a6e2391

Change-Id: I0cab14b4167fc612eea9f7b85ad120d5b9d2f8a8

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) {