summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authorglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-17 02:56:27 +0000
committerglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-17 02:56:27 +0000
commitdb0dc8733a2aa89ad1afe7584be7dc97b03b10d2 (patch)
tree2b53ec7357cdc81798a189f9f15aea67fe2cb51b /chrome/test
parent19633ea2811595f1e9d82f2b131cac4fa23dba38 (diff)
downloadchromium_src-db0dc8733a2aa89ad1afe7584be7dc97b03b10d2.zip
chromium_src-db0dc8733a2aa89ad1afe7584be7dc97b03b10d2.tar.gz
chromium_src-db0dc8733a2aa89ad1afe7584be7dc97b03b10d2.tar.bz2
Disable SUIDSandboxUITest.testSUIDSandboxEnabled under ASan on Linux.
TBR=bradchen BUG=126163 Review URL: https://chromiumcodereview.appspot.com/10561023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142628 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/data/webui/suidsandbox_browsertest.js9
1 files changed, 7 insertions, 2 deletions
diff --git a/chrome/test/data/webui/suidsandbox_browsertest.js b/chrome/test/data/webui/suidsandbox_browsertest.js
index 2f0ab1e..9e9ee8a 100644
--- a/chrome/test/data/webui/suidsandbox_browsertest.js
+++ b/chrome/test/data/webui/suidsandbox_browsertest.js
@@ -20,8 +20,13 @@ SUIDSandboxUITest.prototype = {
// This test is for Linux only.
GEN('#if defined(OS_LINUX)');
-GEN('#define MAYBE_testSUIDSandboxEnabled \\');
-GEN(' testSUIDSandboxEnabled');
+GEN('# if defined(ADDRESS_SANITIZER)');
+GEN('# define MAYBE_testSUIDSandboxEnabled \\');
+GEN(' DISABLED_testSUIDSandboxEnabled');
+GEN('# else');
+GEN('# define MAYBE_testSUIDSandboxEnabled \\');
+GEN(' testSUIDSandboxEnabled');
+GEN('# endif');
GEN('#else');
GEN('#define MAYBE_testSUIDSandboxEnabled \\');
GEN(' DISABLED_testSUIDSandboxEnabled');