summaryrefslogtreecommitdiff
path: root/tests/mte_test.cpp
diff options
context:
space:
mode:
authorEvgenii Stepanov <eugenis@google.com>2021-07-12 14:44:02 -0700
committerRoopesh Nataraja <roopeshr@codeaurora.org>2021-07-14 09:49:31 -0700
commitf33a5e39d9fbefe45c96e1c86b2f7d9efe89f91b (patch)
tree00bee14753e163b7bc48535f3c52ed394027abf6 /tests/mte_test.cpp
parentf30ccc297ab4b5b91fe3eb7efa9f568dccb1919c (diff)
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 CRs-Fixed: 2991521 Test: bionic-unit-tests with MEMTAG_OPTIONS=(off|sync|async) Change-Id: Id80301e6426af16f89bd80a7a7ab127b6fd60425 (cherry picked from commit 53df1f3772ad4843461e78540111b21e9061c051)
Diffstat (limited to 'tests/mte_test.cpp')
-rw-r--r--tests/mte_test.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/mte_test.cpp b/tests/mte_test.cpp
index f329d8d70..ade95326c 100644
--- a/tests/mte_test.cpp
+++ b/tests/mte_test.cpp
@@ -38,7 +38,7 @@ static void test_tag_mismatch() {
#endif
}
#if defined(__aarch64__)
- if (mte_supported()) {
+ if (mte_supported() && running_with_mte()) {
EXPECT_DEATH(
{
volatile int load ATTRIBUTE_UNUSED = *mistagged_p;