Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fdb68593 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Accept SEGV_MTESERR in CrasherTest.mte_async test." am: b3bf57db am:...

Merge "Accept SEGV_MTESERR in CrasherTest.mte_async test." am: b3bf57db am: f58219c0 am: 0a72c97c

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2476664



Change-Id: I02a38e9679a04fef93f882d043c1bc365130089b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 48a28948 0a72c97c
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -642,7 +642,7 @@ TEST_F(CrasherTest, mte_async) {
  std::string result;
  std::string result;
  ConsumeFd(std::move(output_fd), &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
#else
  GTEST_SKIP() << "Requires aarch64";
  GTEST_SKIP() << "Requires aarch64";
#endif
#endif