Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(290)

Unified Diff: components/nacl/loader/nonsfi/nonsfi_sandbox_sigsys_unittest.cc

Issue 408813003: Do not run non-SFI NaCl tests under any sanitizer tools. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/nacl/nacl_browsertest_util.h ('k') | components/nacl/loader/nonsfi/nonsfi_sandbox_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « chrome/test/nacl/nacl_browsertest_util.h ('k') | components/nacl/loader/nonsfi/nonsfi_sandbox_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698