From 4ecae6e753e897d6648421f33343a462c41de9bb Mon Sep 17 00:00:00 2001 From: "henrik.lundin@webrtc.org" Date: Mon, 2 Jun 2014 14:17:06 +0000 Subject: [PATCH] Disable MouseCursorMonitorTest.FromScreen The test is flaky. BUG=3245 TBR=sergeyu@chromium.org Review URL: https://webrtc-codereview.appspot.com/21579004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6300 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../modules/desktop_capture/mouse_cursor_monitor_unittest.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/webrtc/modules/desktop_capture/mouse_cursor_monitor_unittest.cc b/webrtc/modules/desktop_capture/mouse_cursor_monitor_unittest.cc index 5e24d45db0..02b201132d 100644 --- a/webrtc/modules/desktop_capture/mouse_cursor_monitor_unittest.cc +++ b/webrtc/modules/desktop_capture/mouse_cursor_monitor_unittest.cc @@ -17,6 +17,7 @@ #include "webrtc/modules/desktop_capture/window_capturer.h" #include "webrtc/system_wrappers/interface/logging.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h" +#include "webrtc/test/testsupport/gtest_disable.h" namespace webrtc { @@ -59,7 +60,9 @@ class MouseCursorMonitorTest : public testing::Test, #define MAYBE(x) DISABLED_##x #endif -TEST_F(MouseCursorMonitorTest, MAYBE(FromScreen)) { +// Disabled due to flake, see: +// https://code.google.com/p/webrtc/issues/detail?id=3245 +TEST_F(MouseCursorMonitorTest, MAYBE(DISABLED_ON_LINUX(FromScreen))) { scoped_ptr capturer(MouseCursorMonitor::CreateForScreen( DesktopCaptureOptions::CreateDefault(), webrtc::kFullDesktopScreenId)); assert(capturer.get());