commit 4f6c40dd13ea61e8f4730e236fed030a1b45f40a
author Vitaly Buka <vitalybuka@google.com> Wed Jun 23 23:58:09 2021 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Jun 29 14:40:30 2021 -0700
tree b5a486fdc287d59161b880d3e0460a3c3c75bfad
parent 7bd3d8e141c97a1479a037942321f4f442f11866

[scudo] Avoid ifdef in test

GitOrigin-RevId: 6fd963ab64e7f0771bd59056b71ce915bc03d951

tests/wrappers_cpp_test.cpp

diff --git a/tests/wrappers_cpp_test.cpp b/tests/wrappers_cpp_test.cpp
index 24fbf27..461c864 100644
--- a/tests/wrappers_cpp_test.cpp
+++ b/tests/wrappers_cpp_test.cpp
@@ -109,13 +109,12 @@
 }
 
 TEST(ScudoWrappersCppTest, ThreadedNew) {
-#if !SCUDO_ANDROID
   // TODO: Investigate why libc sometimes crashes with tag missmatch in
   // __pthread_clockjoin_ex.
   std::unique_ptr<scudo::ScopedDisableMemoryTagChecks> NoTags;
-  if (scudo::systemSupportsMemoryTagging())
+  if (scudo::systemSupportsMemoryTagging() && !SCUDO_ANDROID)
     NoTags = std::make_unique<scudo::ScopedDisableMemoryTagChecks>();
-#endif
+
   Ready = false;
   std::thread Threads[32];
   for (size_t I = 0U; I < sizeof(Threads) / sizeof(Threads[0]); I++)