Index: components/nacl/loader/nonsfi/nonsfi_sandbox_sigsys_unittest.cc |
diff --git a/components/nacl/loader/nonsfi/nonsfi_sandbox_sigsys_unittest.cc b/components/nacl/loader/nonsfi/nonsfi_sandbox_sigsys_unittest.cc |
index 37dc5992b0451eb7a2ccf4ec5ead1415197e6a4f..1dbe8d47e5c345a63793933e902868dc66dc93e5 100644 |
--- a/components/nacl/loader/nonsfi/nonsfi_sandbox_sigsys_unittest.cc |
+++ b/components/nacl/loader/nonsfi/nonsfi_sandbox_sigsys_unittest.cc |
@@ -2,9 +2,9 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-// ASAN internally uses some syscalls which non-SFI NaCl disallows. |
-// Seccomp-BPF tests die under TSAN v2. See http://crbug.com/356588 |
-#if !defined(ADDRESS_SANITIZER) && !defined(THREAD_SANITIZER) |
+// Sanitizers internally use some syscalls which non-SFI NaCl disallows. |
+#if !defined(ADDRESS_SANITIZER) && !defined(THREAD_SANITIZER) && \ |
+ !defined(MEMORY_SANITIZER) && !defined(LEAK_SANITIZER) |
#include "components/nacl/loader/nonsfi/nonsfi_sandbox.h" |
@@ -613,4 +613,5 @@ RESTRICT_ARM_SYSCALL_DEATH_TEST(set_tls); |
} // namespace |
-#endif // !ADDRESS_SANITIZER && !THREAD_SANITIZER |
+#endif // !ADDRESS_SANITIZER && !THREAD_SANITIZER && |
+ // !MEMORY_SANITIZER && !LEAK_SANITIZER |