commit 1552dcd72c70d3db7009852b856661c9f1e0c8dc
author android-build-prod (mdb) <android-build-team-robot@google.com> Wed May 02 14:56:10 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed May 02 14:56:10 2018 -0700
tree d9a39c54d9f7176cf90c665d7fb0eaa93b56c2f3
parent 18b8cf6ffeedd046ea78b29610c2e5ccfcfc0a48
parent a2c29f978a0bbdefc155863c0776f716259f69f1

Merge "Fix a debuggerd test expectation." am: dbc4aa1ded
am: d724371524

Change-Id: I8eb792a4c7be9aba16314c033132cc06ab5ca52c

debuggerd/debuggerd_test.cpp

diff --git a/debuggerd/debuggerd_test.cpp b/debuggerd/debuggerd_test.cpp
index e410be9..9b64be7 100644
--- a/debuggerd/debuggerd_test.cpp
+++ b/debuggerd/debuggerd_test.cpp
@@ -346,7 +346,9 @@
 
   std::string result;
   ConsumeFd(std::move(output_fd), &result);
-  ASSERT_MATCH(result, R"(signal 11 \(SIGSEGV\), code 0 \(SI_USER\), fault addr --------)");
+  ASSERT_MATCH(
+      result,
+      R"(signal 11 \(SIGSEGV\), code 0 \(SI_USER from pid \d+, uid \d+\), fault addr --------)");
   ASSERT_MATCH(result, R"(backtrace:)");
 }