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
This commit is contained in:
parent
4ecae6e753
commit
2bd032e11c
@ -17,7 +17,6 @@
|
|||||||
#include "webrtc/modules/desktop_capture/window_capturer.h"
|
#include "webrtc/modules/desktop_capture/window_capturer.h"
|
||||||
#include "webrtc/system_wrappers/interface/logging.h"
|
#include "webrtc/system_wrappers/interface/logging.h"
|
||||||
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
|
#include "webrtc/system_wrappers/interface/scoped_ptr.h"
|
||||||
#include "webrtc/test/testsupport/gtest_disable.h"
|
|
||||||
|
|
||||||
namespace webrtc {
|
namespace webrtc {
|
||||||
|
|
||||||
@ -54,15 +53,15 @@ class MouseCursorMonitorTest : public testing::Test,
|
|||||||
//
|
//
|
||||||
// Disabled on Windows due to flake, see:
|
// Disabled on Windows due to flake, see:
|
||||||
// https://code.google.com/p/webrtc/issues/detail?id=3408
|
// 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
|
#define MAYBE(x) x
|
||||||
#else
|
#else
|
||||||
#define MAYBE(x) DISABLED_##x
|
#define MAYBE(x) DISABLED_##x
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Disabled due to flake, see:
|
TEST_F(MouseCursorMonitorTest, MAYBE(FromScreen)) {
|
||||||
// https://code.google.com/p/webrtc/issues/detail?id=3245
|
|
||||||
TEST_F(MouseCursorMonitorTest, MAYBE(DISABLED_ON_LINUX(FromScreen))) {
|
|
||||||
scoped_ptr<MouseCursorMonitor> capturer(MouseCursorMonitor::CreateForScreen(
|
scoped_ptr<MouseCursorMonitor> capturer(MouseCursorMonitor::CreateForScreen(
|
||||||
DesktopCaptureOptions::CreateDefault(), webrtc::kFullDesktopScreenId));
|
DesktopCaptureOptions::CreateDefault(), webrtc::kFullDesktopScreenId));
|
||||||
assert(capturer.get());
|
assert(capturer.get());
|
||||||
|
Loading…
x
Reference in New Issue
Block a user