From 26cbafb89277415109706bdd0b0813a439c2d0dc Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Thu, 22 Jun 2017 20:14:43 -0700 Subject: [PATCH] Debuggerd: Fix debuggerd_test Follow-up to commit 695713e931f0436aca56be9c0dacf2a5dd4e56e7 in bionic. Change expectations of the abort callstack. Test: mmma system/core/debuggerd Test: adb shell /data/nativetest/debuggerd_test/debuggerd_test32 Test: adb shell /data/nativetest64/debuggerd_test/debuggerd_test64 Change-Id: I350a29ee1713a7ebdd50f2b9bdc2078c671e22c7 --- debuggerd/debuggerd_test.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debuggerd/debuggerd_test.cpp b/debuggerd/debuggerd_test.cpp index 4660f3df4..b51fc665e 100644 --- a/debuggerd/debuggerd_test.cpp +++ b/debuggerd/debuggerd_test.cpp @@ -311,7 +311,7 @@ TEST_F(CrasherTest, abort) { 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 @@ TEST_F(CrasherTest, backtrace) { 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 @@ TEST_F(CrasherTest, PR_SET_DUMPABLE_0_crash) { std::string result; ConsumeFd(std::move(output_fd), &result); - ASSERT_BACKTRACE_FRAME(result, "tgkill"); + ASSERT_BACKTRACE_FRAME(result, "abort"); } TEST_F(CrasherTest, capabilities) {