| commit | f58219c0f1b75360e047b84cf7391cc683da5233 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu Mar 09 01:04:34 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 09 01:04:34 2023 +0000 |
| tree | f9c4ba3639db3a40075eaa4496f46c511af44d2c | |
| parent | cc4ebd84429a0c162d1f5ad6239b1732e2b75761 [diff] | |
| parent | b3bf57dbe9730b66afabc4cf225ea14c18f00b9f [diff] |
Merge "Accept SEGV_MTESERR in CrasherTest.mte_async test." am: b3bf57dbe9 Original change: https://android-review.googlesource.com/c/platform/system/core/+/2476664 Change-Id: I550d6a570b3b72a7348595d72ae0408a3c97ea0c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/debuggerd/debuggerd_test.cpp b/debuggerd/debuggerd_test.cpp index 4d60ddb..517f2df 100644 --- a/debuggerd/debuggerd_test.cpp +++ b/debuggerd/debuggerd_test.cpp
@@ -642,7 +642,7 @@ std::string result; ConsumeFd(std::move(output_fd), &result); - ASSERT_MATCH(result, R"(signal 11 \(SIGSEGV\), code 8 \(SEGV_MTEAERR\), fault addr --------)"); + ASSERT_MATCH(result, R"(signal 11 \(SIGSEGV\), code [89] \(SEGV_MTE[AS]ERR\), fault addr)"); #else GTEST_SKIP() << "Requires aarch64"; #endif