From 6ef21a7af0f60f986621123dd37c323d52a415c5 Mon Sep 17 00:00:00 2001 From: Mirko Bonadei Date: Mon, 7 Sep 2020 18:28:55 +0000 Subject: [PATCH] Revert "Reland "reenable mouse_cursor_monitor tests on linux"" 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 > > Reviewed-by: Sergey Ulanov > > Commit-Queue: Tommi > > 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 > Reviewed-by: Mirko Bonadei > 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 Commit-Queue: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#32053} --- modules/desktop_capture/mouse_cursor_monitor_unittest.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/desktop_capture/mouse_cursor_monitor_unittest.cc b/modules/desktop_capture/mouse_cursor_monitor_unittest.cc index 739fa863f5..ee2dff32af 100644 --- a/modules/desktop_capture/mouse_cursor_monitor_unittest.cc +++ b/modules/desktop_capture/mouse_cursor_monitor_unittest.cc @@ -52,10 +52,9 @@ class MouseCursorMonitorTest : public ::testing::Test, // // Disabled on Windows due to flake, see: // https://code.google.com/p/webrtc/issues/detail?id=3408 -// -// Enabled on Linux only when building with X11 support. -#if !defined(WEBRTC_MAC) && !defined(WEBRTC_WIN) && \ - !(defined(WEBRTC_LINUX) && !defined(WEBRTC_USE_X11)) +// 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