| commit | d0b1ae30ff1a2b6a20da6eb9d9765aa6d96fa4a8 | [log] [tgz] |
|---|---|---|
| author | Vitaly Buka <vitalybuka@google.com> | Tue Jul 13 04:25:56 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jul 13 04:25:56 2021 +0000 |
| tree | 8d5f617e53502d42109444e1f4fc00b5820eb95e | |
| parent | 6c4048bccad2d0d023b2d862b81c13dac53b77f2 [diff] | |
| parent | 0aa9b8fb2bf4e9ee0facb9332bcae5350b11bcb4 [diff] |
[scudo] Fix test on arch without MTE am: b581108c5d am: 6aa3c4f3cc am: 0aa9b8fb2b Original change: https://android-review.googlesource.com/c/platform/external/scudo/+/1763649 Change-Id: I762af459b9852c0d561fef72eb854cf4b878fe44
diff --git a/standalone/tests/wrappers_cpp_test.cpp b/standalone/tests/wrappers_cpp_test.cpp index 461c864..747638b 100644 --- a/standalone/tests/wrappers_cpp_test.cpp +++ b/standalone/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;