| Index: components/nacl/loader/nonsfi/nonsfi_sandbox_unittest.cc
|
| diff --git a/components/nacl/loader/nonsfi/nonsfi_sandbox_unittest.cc b/components/nacl/loader/nonsfi/nonsfi_sandbox_unittest.cc
|
| index 4b3da8581836ce2c76cce9bb8846513780815319..73b01027bebfc8f1487c2468b1ba0c6142a5e593 100644
|
| --- a/components/nacl/loader/nonsfi/nonsfi_sandbox_unittest.cc
|
| +++ b/components/nacl/loader/nonsfi/nonsfi_sandbox_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"
|
|
|
| @@ -514,4 +514,5 @@ RESTRICT_SYSCALL_EPERM_TEST(time);
|
|
|
| } // namespace
|
|
|
| -#endif // !ADDRESS_SANITIZER && !THREAD_SANITIZER
|
| +#endif // !ADDRESS_SANITIZER && !THREAD_SANITIZER &&
|
| + // !MEMORY_SANITIZER && !LEAK_SANITIZER
|
|
|