commit 53df1f3772ad4843461e78540111b21e9061c051
author Evgenii Stepanov <eugenis@google.com> Mon Jul 12 14:44:02 2021 -0700
committer Evgenii Stepanov <eugenis@google.com> Mon Jul 12 16:33:26 2021 -0700
tree f43d0cf9b5f14461f63e624d3dcd11cf7669b743
parent 2ef1cd3f4430d344d88f1275b850119dc963cfa1

Make MTE tests pass with all values of MEMTAG_OPTIONS.

Do not assume that tests start with Sync MTE; check the initial setting
and change test logic as appropriate.

Bug: 192480262
Test: bionic-unit-tests with MEMTAG_OPTIONS=(off|sync|async)
Change-Id: Id80301e6426af16f89bd80a7a7ab127b6fd60425

tests/mte_test.cpp

diff --git a/tests/mte_test.cpp b/tests/mte_test.cpp
index f329d8d..ade9532 100644
--- a/tests/mte_test.cpp
+++ b/tests/mte_test.cpp
@@ -38,7 +38,7 @@
 #endif
   }
 #if defined(__aarch64__)
-  if (mte_supported()) {
+  if (mte_supported() && running_with_mte()) {
     EXPECT_DEATH(
         {
           volatile int load ATTRIBUTE_UNUSED = *mistagged_p;