summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authorasvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-05 14:30:50 +0000
committerasvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-05 14:30:50 +0000
commit50a7f3ac93b149faf00171c76985eb2698669a87 (patch)
tree83b36d49af6f27be440a0f52e50afcf5eeb109db /chrome/test
parentf5194a225c63ab0c51e96a303fc2b3e3b42b2146 (diff)
downloadchromium_src-50a7f3ac93b149faf00171c76985eb2698669a87.zip
chromium_src-50a7f3ac93b149faf00171c76985eb2698669a87.tar.gz
chromium_src-50a7f3ac93b149faf00171c76985eb2698669a87.tar.bz2
Mark OutOfProcessPPAPITest.InputEvent as flaky on Mac.
TBR=atwilson@chromium.org BUG=109258 Review URL: http://codereview.chromium.org/9112009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116486 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/ui/ppapi_uitest.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/test/ui/ppapi_uitest.cc b/chrome/test/ui/ppapi_uitest.cc
index cd52ed3..0bf637b 100644
--- a/chrome/test/ui/ppapi_uitest.cc
+++ b/chrome/test/ui/ppapi_uitest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -327,6 +327,9 @@ TEST_PPAPI_NACL_VIA_HTTP(MAYBE_CursorControl)
// Times out on Linux. http://crbug.com/108859
#if defined(OS_LINUX)
#define MAYBE_InputEvent DISABLED_InputEvent
+#elif defined(OS_MACOSX)
+// Flaky on Mac. http://crbug.com/109258
+#define MAYBE_InputEvent FLAKY_InputEvent
#else
#define MAYBE_InputEvent InputEvent
#endif