From 9749e5c67039f3def257661a3223dd0ba84736cd Mon Sep 17 00:00:00 2001 From: "bauerb@chromium.org" Date: Thu, 9 Sep 2010 08:38:42 +0000 Subject: Mark MediaBrowserTest.VideoBearTheora as FLAKY on Mac OS. TBR=imcheng@chromium.org BUG=54939 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58921 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/media_browsertest.cc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/chrome/browser/media_browsertest.cc b/chrome/browser/media_browsertest.cc index 677c37b..8f85de7 100644 --- a/chrome/browser/media_browsertest.cc +++ b/chrome/browser/media_browsertest.cc @@ -90,7 +90,14 @@ class MediaBrowserTest : public InProcessBrowserTest { } }; -IN_PROC_BROWSER_TEST_F(MediaBrowserTest, VideoBearTheora) { +// Crashes on Mac OS (http://crbug.com/54939) +#if defined(OS_MACOSX) +#define MAYBE_VideoBearTheora FLAKY_VideoBearTheora +#else +#define MAYBE_VideoBearTheora VideoBearTheora +#endif + +IN_PROC_BROWSER_TEST_F(MediaBrowserTest, MAYBE_VideoBearTheora) { PlayVideo("bear.ogv"); } -- cgit v1.1