summaryrefslogtreecommitdiffstats
path: root/content/browser/webui/web_ui_mojo_browsertest.cc
diff options
context:
space:
mode:
authorzmo <zmo@chromium.org>2014-09-26 11:02:56 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-26 18:03:45 +0000
commitc2c1d5800d22199fe052aa882925c26674c70ef0 (patch)
tree98016ecb8fa0661a936ec2ddace8b1a6f9d84318 /content/browser/webui/web_ui_mojo_browsertest.cc
parent3a204d122902fb95d3d814779ca979cbfa210020 (diff)
downloadchromium_src-c2c1d5800d22199fe052aa882925c26674c70ef0.zip
chromium_src-c2c1d5800d22199fe052aa882925c26674c70ef0.tar.gz
chromium_src-c2c1d5800d22199fe052aa882925c26674c70ef0.tar.bz2
Disable WebUIMojoTest.EndToEndPing on Linux
BUG=418019 TEST=linux bots, content_browsertests TBR=viettrungluu@chromium.org NOTRY=true Review URL: https://codereview.chromium.org/612483002 Cr-Commit-Position: refs/heads/master@{#296979}
Diffstat (limited to 'content/browser/webui/web_ui_mojo_browsertest.cc')
-rw-r--r--content/browser/webui/web_ui_mojo_browsertest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/content/browser/webui/web_ui_mojo_browsertest.cc b/content/browser/webui/web_ui_mojo_browsertest.cc
index aa6285d..065bc7a 100644
--- a/content/browser/webui/web_ui_mojo_browsertest.cc
+++ b/content/browser/webui/web_ui_mojo_browsertest.cc
@@ -197,8 +197,8 @@ class WebUIMojoTest : public ContentBrowserTest {
// Loads a webui page that contains mojo bindings and verifies a message makes
// it from the browser to the page and back.
-// Fails on Win only. http://crbug.com/418019
-#if defined(OS_WIN)
+// Fails on Win and Linux. http://crbug.com/418019
+#if defined(OS_WIN) || defined(OS_LINUX)
#define MAYBE_EndToEndPing DISABLED_EndToEndPing
#else
#define MAYBE_EndToEndPing EndToEndPing