commit b25119e3fd4cdb42f594b66c5ff4b53333140668
author Vitaly Buka <vitalybuka@google.com> Thu Jun 24 00:07:24 2021 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Jun 29 14:40:34 2021 -0700
tree b09e9634a22e7dd06a542220628121975730e7d6
parent 4f6c40dd13ea61e8f4730e236fed030a1b45f40a

[scudo] Fix test on arch without MTE

GitOrigin-RevId: 35e1dbd18920a0f1863cd06651d217693a94ad60

tests/wrappers_cpp_test.cpp

diff --git a/tests/wrappers_cpp_test.cpp b/tests/wrappers_cpp_test.cpp
index 461c864..747638b 100644
--- a/tests/wrappers_cpp_test.cpp
+++ b/tests/wrappers_cpp_test.cpp
@@ -112,7 +112,7 @@
   // TODO: Investigate why libc sometimes crashes with tag missmatch in
   // __pthread_clockjoin_ex.
   std::unique_ptr<scudo::ScopedDisableMemoryTagChecks> NoTags;
-  if (scudo::systemSupportsMemoryTagging() && !SCUDO_ANDROID)
+  if (!SCUDO_ANDROID && scudo::archSupportsMemoryTagging() && scudo::systemSupportsMemoryTagging())
     NoTags = std::make_unique<scudo::ScopedDisableMemoryTagChecks>();
 
   Ready = false;