summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authorbradchen@google.com <bradchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-18 16:01:15 +0000
committerbradchen@google.com <bradchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-18 16:01:15 +0000
commitd232df42dfa342af0e52a24b39e833a24a170af1 (patch)
tree31e1367c3f7460b8b9a5637264f91bca2fc64af5 /chrome/test
parent3e58a3a59bd6ba6429193af10630ad35c98af248 (diff)
downloadchromium_src-d232df42dfa342af0e52a24b39e833a24a170af1.zip
chromium_src-d232df42dfa342af0e52a24b39e833a24a170af1.tar.gz
chromium_src-d232df42dfa342af0e52a24b39e833a24a170af1.tar.bz2
Re-enable the testSUIDSandboxEnabled test. Mark as FLAKY_ while additional bot issues are getting resolved.
TBR=cmp BUG=126163 TEST=this is a test Review URL: https://chromiumcodereview.appspot.com/10565035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142721 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/data/webui/suidsandbox_browsertest.js20
1 files changed, 11 insertions, 9 deletions
diff --git a/chrome/test/data/webui/suidsandbox_browsertest.js b/chrome/test/data/webui/suidsandbox_browsertest.js
index e0d8022..ef7eece 100644
--- a/chrome/test/data/webui/suidsandbox_browsertest.js
+++ b/chrome/test/data/webui/suidsandbox_browsertest.js
@@ -19,18 +19,20 @@ SUIDSandboxUITest.prototype = {
};
// This test is for Linux only.
+// PLEASE READ:
+// - If failures of this test are a problem on a bot under your care,
+// the proper way to address such failures is to install the SUID
+// sandbox. See:
+// http://code.google.com/p/chromium/wiki/LinuxSUIDSandboxDevelopment
+// - PLEASE DO NOT DISABLE THIS TEST. If you can't figure out how to
+// get the SUID sandbox installed, please mark the test FLAKY_ so we
+// can get clear information on where the sandbox is and isn't installed.
GEN('#if defined(OS_LINUX)');
-GEN('# if defined(ADDRESS_SANITIZER)');
GEN('# define MAYBE_testSUIDSandboxEnabled \\');
-GEN(' DISABLED_testSUIDSandboxEnabled');
-GEN('# else');
-// Linux test is temporarily marked as FAILS: http://crbug.com/133244
-GEN('# define MAYBE_testSUIDSandboxEnabled \\');
-GEN(' FAILS_testSUIDSandboxEnabled');
-GEN('# endif');
+GEN(' FLAKY_testSUIDSandboxEnabled');
GEN('#else');
-GEN('#define MAYBE_testSUIDSandboxEnabled \\');
-GEN(' DISABLED_testSUIDSandboxEnabled');
+GEN('# define MAYBE_testSUIDSandboxEnabled \\');
+GEN(' DISABLED_testSUIDSandboxEnabled');
GEN('#endif');
/**