| Index: chrome/test/nacl/nacl_browsertest_util.h
|
| diff --git a/chrome/test/nacl/nacl_browsertest_util.h b/chrome/test/nacl/nacl_browsertest_util.h
|
| index 7f74379d94966222395035d35032dfb630828491..ca943c738b272dca104753234284194c077b85a8 100644
|
| --- a/chrome/test/nacl/nacl_browsertest_util.h
|
| +++ b/chrome/test/nacl/nacl_browsertest_util.h
|
| @@ -183,8 +183,10 @@ class NaClBrowserTestNewlibExtension : public NaClBrowserTestNewlib {
|
| # define MAYBE_GLIBC(test_name) DISABLED_##test_name
|
| #endif
|
|
|
| -// ASan does not work with libc-free context, so disable the test.
|
| -#if defined(OS_LINUX) && !defined(ADDRESS_SANITIZER)
|
| +// Sanitizers internally use some syscalls which non-SFI NaCl disallows.
|
| +#if defined(OS_LINUX) && !defined(ADDRESS_SANITIZER) && \
|
| + !defined(THREAD_SANITIZER) && !defined(MEMORY_SANITIZER) && \
|
| + !defined(LEAK_SANITIZER)
|
| # define MAYBE_NONSFI(test_case) test_case
|
| #else
|
| # define MAYBE_NONSFI(test_case) DISABLED_##test_case
|
|
|