summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsatish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-21 11:33:13 +0000
committersatish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-21 11:33:13 +0000
commit359b63ecd938dfcb55a2dafdd88eb7f4e50195ea (patch)
tree360e5aa62ef83b460da4dd669d2fe63f5a949af3
parent9670a2b08def02a1ec3448d1d9374b9e6a7854c0 (diff)
downloadchromium_src-359b63ecd938dfcb55a2dafdd88eb7f4e50195ea.zip
chromium_src-359b63ecd938dfcb55a2dafdd88eb7f4e50195ea.tar.gz
chromium_src-359b63ecd938dfcb55a2dafdd88eb7f4e50195ea.tar.bz2
Disable a test that fails in the Linux perf canary
BUG=56364 TEST=linux perf canary goes green TBR=imcheng@chromium.org git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60044 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/media_uitest.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/media_uitest.cc b/chrome/browser/media_uitest.cc
index 8f62a2a..c13cb71 100644
--- a/chrome/browser/media_uitest.cc
+++ b/chrome/browser/media_uitest.cc
@@ -67,7 +67,13 @@ class MediaTest : public UITest {
#define MAYBE_VideoBearSilentWebm VideoBearSilentWebm
#define MAYBE_VideoBearMp4 VideoBearMp4
#define MAYBE_VideoBearSilentMp4 VideoBearSilentMp4
+
+#if defined(OS_LINUX)
+// Test fails on linux: http://crbug.com/56364
+#define MAYBE_MediaUILayoutTest DISABLED_MediaUILayoutTest
+#else
#define MAYBE_MediaUILayoutTest MediaUILayoutTest
+#endif
#endif