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

Unified Diff: chrome/test/nacl/nacl_browsertest_util.h

Issue 1882753002: Re-enable tests for Non-SFI NaCl (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Disable under sanitizers Created 4 years, 2 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 5b7a5dd0e7e38c063a00ffd17056138f98a5232b..a16881b71ad16a427b77648fb72eccd0cef41cf0 100644
--- a/chrome/test/nacl/nacl_browsertest_util.h
+++ b/chrome/test/nacl/nacl_browsertest_util.h
@@ -196,10 +196,11 @@ class NaClBrowserTestGLibcExtension : public NaClBrowserTestGLibc {
// Similar to MAYBE_NONSFI, this is available only on x86-32, x86-64 or
// ARM linux.
-// TODO(crbug.com/579804) -- tests disabled on Linux for flakiness.
-#if defined(OS_LINUX) && \
+#if defined(OS_LINUX) && !defined(ADDRESS_SANITIZER) && \
+ !defined(THREAD_SANITIZER) && !defined(MEMORY_SANITIZER) && \
+ !defined(LEAK_SANITIZER) && \
(defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARMEL))
-# define MAYBE_PNACL_NONSFI(test_case) DISABLED_##test_case
+# define MAYBE_PNACL_NONSFI(test_case) test_case
#else
# define MAYBE_PNACL_NONSFI(test_case) DISABLED_##test_case
#endif
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698