Commit 61d73c86 authored by earthdok@chromium.org's avatar earthdok@chromium.org

Do not run non-SFI NaCl tests under any sanitizer tools.

The sandbox policy is too restrictive.

BUG=395578
R=mseaborn@chromium.org

Review URL: https://codereview.chromium.org/408813003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284656 0039d316-1c4b-4281-b951-d872f2087c98
parent a57d0687
...@@ -183,8 +183,10 @@ class NaClBrowserTestNewlibExtension : public NaClBrowserTestNewlib { ...@@ -183,8 +183,10 @@ class NaClBrowserTestNewlibExtension : public NaClBrowserTestNewlib {
# define MAYBE_GLIBC(test_name) DISABLED_##test_name # define MAYBE_GLIBC(test_name) DISABLED_##test_name
#endif #endif
// ASan does not work with libc-free context, so disable the test. // Sanitizers internally use some syscalls which non-SFI NaCl disallows.
#if defined(OS_LINUX) && !defined(ADDRESS_SANITIZER) #if defined(OS_LINUX) && !defined(ADDRESS_SANITIZER) && \
!defined(THREAD_SANITIZER) && !defined(MEMORY_SANITIZER) && \
!defined(LEAK_SANITIZER)
# define MAYBE_NONSFI(test_case) test_case # define MAYBE_NONSFI(test_case) test_case
#else #else
# define MAYBE_NONSFI(test_case) DISABLED_##test_case # define MAYBE_NONSFI(test_case) DISABLED_##test_case
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
// ASAN internally uses some syscalls which non-SFI NaCl disallows. // Sanitizers internally use 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) && \
#if !defined(ADDRESS_SANITIZER) && !defined(THREAD_SANITIZER) !defined(MEMORY_SANITIZER) && !defined(LEAK_SANITIZER)
#include "components/nacl/loader/nonsfi/nonsfi_sandbox.h" #include "components/nacl/loader/nonsfi/nonsfi_sandbox.h"
...@@ -613,4 +613,5 @@ RESTRICT_ARM_SYSCALL_DEATH_TEST(set_tls); ...@@ -613,4 +613,5 @@ RESTRICT_ARM_SYSCALL_DEATH_TEST(set_tls);
} // namespace } // namespace
#endif // !ADDRESS_SANITIZER && !THREAD_SANITIZER #endif // !ADDRESS_SANITIZER && !THREAD_SANITIZER &&
// !MEMORY_SANITIZER && !LEAK_SANITIZER
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
// ASan internally uses some syscalls which non-SFI NaCl disallows. // Sanitizers internally use 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) && \
#if !defined(ADDRESS_SANITIZER) && !defined(THREAD_SANITIZER) !defined(MEMORY_SANITIZER) && !defined(LEAK_SANITIZER)
#include "components/nacl/loader/nonsfi/nonsfi_sandbox.h" #include "components/nacl/loader/nonsfi/nonsfi_sandbox.h"
...@@ -514,4 +514,5 @@ RESTRICT_SYSCALL_EPERM_TEST(time); ...@@ -514,4 +514,5 @@ RESTRICT_SYSCALL_EPERM_TEST(time);
} // namespace } // namespace
#endif // !ADDRESS_SANITIZER && !THREAD_SANITIZER #endif // !ADDRESS_SANITIZER && !THREAD_SANITIZER &&
// !MEMORY_SANITIZER && !LEAK_SANITIZER
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment