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

Unified Diff: chrome/test/data/webui/sandboxstatus_browsertest.js

Issue 2771443002: Revert of WebUI: Disable all JS tests in MSAN, ASAN, and TSAN bots. (Closed)
Patch Set: Created 3 years, 9 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
Index: chrome/test/data/webui/sandboxstatus_browsertest.js
diff --git a/chrome/test/data/webui/sandboxstatus_browsertest.js b/chrome/test/data/webui/sandboxstatus_browsertest.js
index 973b8cfeaabc13a47dfb41888eb29b94f72e3192..a99993de85e23045c1fbc33820b56c68856a08be 100644
--- a/chrome/test/data/webui/sandboxstatus_browsertest.js
+++ b/chrome/test/data/webui/sandboxstatus_browsertest.js
@@ -25,7 +25,9 @@
// sandbox. See:
// https://chromium.googlesource.com/chromium/src/+/master/docs/linux_suid_sandbox_development.md
// - PLEASE DO NOT GLOBALLY DISABLE THIS TEST.
-GEN('#if defined(OS_LINUX)');
+// SUID sandbox is currently incompatible with AddressSanitizer,
+// see http://crbug.com/137653.
+GEN('#if defined(OS_LINUX) && !defined(ADDRESS_SANITIZER)');
GEN('# define MAYBE_testSUIDorNamespaceSandboxEnabled \\');
GEN(' testSUIDorNamespaceSandboxEnabled');
GEN('#else');
@@ -64,7 +66,7 @@
});
// The seccomp-bpf sandbox is also not compatible with ASAN.
-GEN('#if !defined(OS_LINUX)');
+GEN('#if !defined(OS_LINUX) || defined(ADDRESS_SANITIZER)');
GEN('# define MAYBE_testBPFSandboxEnabled \\');
GEN(' DISABLED_testBPFSandboxEnabled');
GEN('#else');

Powered by Google App Engine
This is Rietveld 408576698