From bddedcbb333dbd501b4456dc2a2bc48ef50d21b5 Mon Sep 17 00:00:00 2001 From: Philipp Hancke Date: Mon, 17 Aug 2020 15:33:07 +0200 Subject: [PATCH] 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} --- modules/desktop_capture/mouse_cursor_monitor_unittest.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/desktop_capture/mouse_cursor_monitor_unittest.cc b/modules/desktop_capture/mouse_cursor_monitor_unittest.cc index ee2dff32af..739fa863f5 100644 --- a/modules/desktop_capture/mouse_cursor_monitor_unittest.cc +++ b/modules/desktop_capture/mouse_cursor_monitor_unittest.cc @@ -52,9 +52,10 @@ class MouseCursorMonitorTest : public ::testing::Test, // // Disabled on Windows due to flake, see: // https://code.google.com/p/webrtc/issues/detail?id=3408 -// 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) +// +// Enabled on Linux only when building with X11 support. +#if !defined(WEBRTC_MAC) && !defined(WEBRTC_WIN) && \ + !(defined(WEBRTC_LINUX) && !defined(WEBRTC_USE_X11)) #define MAYBE(x) x #else #define MAYBE(x) DISABLED_##x