From 2bd032e11cb0c49d29ae970a20c5f212096d8648 Mon Sep 17 00:00:00 2001 From: "henrik.lundin@webrtc.org" Date: Mon, 2 Jun 2014 14:52:34 +0000 Subject: [PATCH] Disable MouseCursorMonitorTest Last attempt reverted. Trying again in a different way. This CL effectively reverts r6300. BUG=3245 TBR=sergeyu@chromium.org Review URL: https://webrtc-codereview.appspot.com/20549004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6301 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../desktop_capture/mouse_cursor_monitor_unittest.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/webrtc/modules/desktop_capture/mouse_cursor_monitor_unittest.cc b/webrtc/modules/desktop_capture/mouse_cursor_monitor_unittest.cc index 02b201132d..c6af2b700e 100644 --- a/webrtc/modules/desktop_capture/mouse_cursor_monitor_unittest.cc +++ b/webrtc/modules/desktop_capture/mouse_cursor_monitor_unittest.cc @@ -17,7 +17,6 @@ #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 { @@ -54,15 +53,15 @@ class MouseCursorMonitorTest : public testing::Test, // // Disabled on Windows due to flake, see: // https://code.google.com/p/webrtc/issues/detail?id=3408 -#if !defined(WEBRTC_MAC) && !defined(WEBRTC_WIN) +// Disabled on Linux due to flake, see: +// https://code.google.com/p/webrtc/issues/detail?id=3245 +#if !defined(WEBRTC_MAC) && !defined(WEBRTC_WIN) && !defined(WEBRTC_LINUX) #define MAYBE(x) x #else #define MAYBE(x) DISABLED_##x #endif -// Disabled due to flake, see: -// https://code.google.com/p/webrtc/issues/detail?id=3245 -TEST_F(MouseCursorMonitorTest, MAYBE(DISABLED_ON_LINUX(FromScreen))) { +TEST_F(MouseCursorMonitorTest, MAYBE(FromScreen)) { scoped_ptr capturer(MouseCursorMonitor::CreateForScreen( DesktopCaptureOptions::CreateDefault(), webrtc::kFullDesktopScreenId)); assert(capturer.get());