summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-18 19:08:19 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-01-18 19:08:19 +0000
commit6ee71d4271b275e8029c84b726d288261b60bc2e (patch)
tree12835e16607f088bf53859df84f5a7cfce4b3749
parent33a01a0db61786f676fe4fcc78722c114797ec42 (diff)
downloadchromium_src-6ee71d4271b275e8029c84b726d288261b60bc2e.zip
chromium_src-6ee71d4271b275e8029c84b726d288261b60bc2e.tar.gz
chromium_src-6ee71d4271b275e8029c84b726d288261b60bc2e.tar.bz2
linux-aura/webrtc: Disable a couple of tests failing on the bots.
WebRtcBrowserTest.NegotiateUnsupportedVideoCodec and NegotiateNonCryptoCall. BUG=335916 TBR=erg@chromium.org Review URL: https://codereview.chromium.org/141423003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245789 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/browser/media/webrtc_browsertest.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/content/browser/media/webrtc_browsertest.cc b/content/browser/media/webrtc_browsertest.cc
index b1bed15..afeab49 100644
--- a/content/browser/media/webrtc_browsertest.cc
+++ b/content/browser/media/webrtc_browsertest.cc
@@ -135,6 +135,10 @@ IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest,
// Disabled for Ozone, see http://crbug.com/315392#c15
#define MAYBE_NegotiateUnsupportedVideoCodec\
DISABLED_NegotiateUnsupportedVideoCodec
+#elif defined(OS_LINUX) && defined(USE_AURA)
+// http://crbug.com/335916
+#define MAYBE_NegotiateUnsupportedVideoCodec\
+ DISABLED_NegotiateUnsupportedVideoCodec
#else
#define MAYBE_NegotiateUnsupportedVideoCodec NegotiateUnsupportedVideoCodec
#endif
@@ -149,6 +153,9 @@ IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest,
#if defined(USE_OZONE)
// Disabled for Ozone, see http://crbug.com/315392#c15
#define MAYBE_NegotiateNonCryptoCall DISABLED_NegotiateNonCryptoCall
+#elif defined(OS_LINUX) && defined(USE_AURA)
+// http:://crbug.com/335916
+#define MAYBE_NegotiateNonCryptoCall DISABLED_NegotiateNonCryptoCall
#else
#define MAYBE_NegotiateNonCryptoCall NegotiateNonCryptoCall
#endif