zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Reland "reenable mouse_cursor_monitor tests on linux""

Browse Source 
This reverts commit bddedcbb333dbd501b4456dc2a2bc48ef50d21b5.

Reason for revert: Breaks downstream project.

Original change's description:
> Reland "reenable mouse_cursor_monitor tests on linux"
> 
> This is a reland of 79098821a23f9de49f70cb3794b51e2730bffa01
> with changes to disable the tests when not building with X11 support.
> 
> TBR=sergeyu@chromium.org
> Original change's description:
> > reenable mouse_cursor_monitor tests on linux
> >
> > BUG=webrtc:3245
> >
> > Change-Id: Ibf9cd929b22a0a519950621da46eb9f5b3febd73
> > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/181367
> > Reviewed-by: Tommi <tommi@webrtc.org>
> > Reviewed-by: Sergey Ulanov <sergeyu@google.com>
> > Commit-Queue: Tommi <tommi@webrtc.org>
> > Cr-Commit-Position: refs/heads/master@{#31940}
> 
> BUG=webrtc:3245
> 
> Change-Id: I882e08f6f425df357f16fa4db25dcdf79db1f367
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/181882
> Commit-Queue: Philipp Hancke <philipp.hancke@googlemail.com>
> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#32047}

TBR=mbonadei@webrtc.org,kwiberg@webrtc.org,nisse@webrtc.org,sergeyu@chromium.org,philipp.hancke@googlemail.com

Change-Id: I2196dcbf996057dada79cc4cbae6522d6a934c75
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:3245
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/183544
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32053}
This commit is contained in:
Mirko Bonadei
2020-09-07 18:28:55 +00:00
committed by Commit Bot
parent fd71e799cb
commit 6ef21a7af0
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/desktop_capture/mouse_cursor_monitor_unittest.cc
View File

@ -52,10 +52,9 @@ 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
// // Disabled on Linux due to flake, see:
// Enabled on Linux only when building with X11 support. // https://code.google.com/p/webrtc/issues/detail?id=3245
#if !defined(WEBRTC_MAC) && !defined(WEBRTC_WIN) && \ #if !defined(WEBRTC_MAC) && !defined(WEBRTC_WIN) && !defined(WEBRTC_LINUX)
!(defined(WEBRTC_LINUX) && !defined(WEBRTC_USE_X11))
#define MAYBE(x) x #define MAYBE(x) x
#else #else
#define MAYBE(x) DISABLED_##x #define MAYBE(x) DISABLED_##x