From 969b12f6aaf71640a6aa0412bb9c6f87b631a17a Mon Sep 17 00:00:00 2001 From: kjellander Date: Fri, 2 Dec 2016 03:30:45 -0800 Subject: [PATCH] Remove xdisplaycheck The tool is no longer needed and will be removed in Chromium. BUG=chromium:670470 Review-Url: https://codereview.webrtc.org/2548763002 Cr-Commit-Position: refs/heads/master@{#15384} --- setup_links.py | 1 - tools/mb/mb.py | 1 - tools/mb/mb_unittest.py | 1 - webrtc/test/BUILD.gn | 4 ---- 4 files changed, 7 deletions(-) diff --git a/setup_links.py b/setup_links.py index 07f92ee852..901e0ee5ae 100755 --- a/setup_links.py +++ b/setup_links.py @@ -81,7 +81,6 @@ DIRECTORIES = [ 'tools/valgrind', 'tools/vim', 'tools/win', - 'tools/xdisplaycheck', ] from sync_chromium import get_target_os_list diff --git a/tools/mb/mb.py b/tools/mb/mb.py index 5ae0a7fe8e..5ba094a2b2 100755 --- a/tools/mb/mb.py +++ b/tools/mb/mb.py @@ -1106,7 +1106,6 @@ class MetaBuildWrapper(object): xvfb = use_x11 and test_type == 'windowed_test_launcher' if xvfb: extra_files += [ - 'xdisplaycheck', '../../testing/xvfb.py', ] diff --git a/tools/mb/mb_unittest.py b/tools/mb/mb_unittest.py index fe0ffc974b..1505bbe05a 100755 --- a/tools/mb/mb_unittest.py +++ b/tools/mb/mb_unittest.py @@ -529,7 +529,6 @@ class UnitTest(unittest.TestCase): '../../third_party/gtest-parallel/gtest-parallel-wrapper.py', 'base_unittests', 'some_resource_file', - 'xdisplaycheck', ]) self.assertEqual(command, [ '../../testing/xvfb.py', diff --git a/webrtc/test/BUILD.gn b/webrtc/test/BUILD.gn index 1b3c05973a..809274f7b7 100644 --- a/webrtc/test/BUILD.gn +++ b/webrtc/test/BUILD.gn @@ -148,10 +148,6 @@ rtc_source_set("test_support") { configs += [ "//build/config/compiler:enable_arc" ] } - if (use_x11) { - deps += [ "//tools/xdisplaycheck" ] - } - if (is_android) { deps += [ "//base:base" ] data = [