commit c5f0640e487b267a06dce6623767194ce50bb4c3
author Woody Lin <woodylin@google.com> Sat May 09 01:51:04 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat May 09 01:51:04 2020 +0000
tree d8d935463f70b9a2b407d0651a0a08ce2d137c3c
parent 5d97966e8f33eea4a42fc8f7c2b696363ce4f0a8
parent be1cf9006ab91e77114c19b8f596f8141d8e0b84

Merge "InitFatalReboot: Trigger panic explicitly for init_fatal_panic"

debuggerd/debuggerd_test.cpp

diff --git a/debuggerd/debuggerd_test.cpp b/debuggerd/debuggerd_test.cpp
index 25417a9..9d7658e 100644
--- a/debuggerd/debuggerd_test.cpp
+++ b/debuggerd/debuggerd_test.cpp
@@ -379,7 +379,12 @@
   ConsumeFd(std::move(output_fd), &result);
 
   ASSERT_MATCH(result, R"(signal 11 \(SIGSEGV\), code 9 \(SEGV_MTESERR\))");
-  ASSERT_MATCH(result, R"(Cause: \[MTE\]: Use After Free, 0 bytes into a 16-byte allocation)");
+  ASSERT_MATCH(result, R"(Cause: \[MTE\]: Use After Free, 0 bytes into a 16-byte allocation.*
+
+allocated by thread .*
+      #00 pc)");
+  ASSERT_MATCH(result, R"(deallocated by thread .*
+      #00 pc)");
 #else
   GTEST_SKIP() << "Requires aarch64 + ANDROID_EXPERIMENTAL_MTE";
 #endif
@@ -410,7 +415,10 @@
   ConsumeFd(std::move(output_fd), &result);
 
   ASSERT_MATCH(result, R"(signal 11 \(SIGSEGV\))");
-  ASSERT_MATCH(result, R"(Cause: \[MTE\]: Buffer Overflow, 0 bytes right of a 16-byte allocation)");
+  ASSERT_MATCH(result, R"(Cause: \[MTE\]: Buffer Overflow, 0 bytes right of a 16-byte allocation.*
+
+allocated by thread .*
+      #00 pc)");
 #else
   GTEST_SKIP() << "Requires aarch64 + ANDROID_EXPERIMENTAL_MTE";
 #endif
@@ -441,7 +449,10 @@
   ConsumeFd(std::move(output_fd), &result);
 
   ASSERT_MATCH(result, R"(signal 11 \(SIGSEGV\), code 9 \(SEGV_MTESERR\))");
-  ASSERT_MATCH(result, R"(Cause: \[MTE\]: Buffer Underflow, 4 bytes left of a 16-byte allocation)");
+  ASSERT_MATCH(result, R"(Cause: \[MTE\]: Buffer Underflow, 4 bytes left of a 16-byte allocation.*
+
+allocated by thread .*
+      #00 pc)");
 #else
   GTEST_SKIP() << "Requires aarch64 + ANDROID_EXPERIMENTAL_MTE";
 #endif