diff --git a/PRESUBMIT.py b/PRESUBMIT.py index 370bca4241e0c0..c49ccd0c4f895c 100644 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py @@ -1691,7 +1691,6 @@ def GetTryServerMasterForBot(bot): """ # Potentially ambiguous bot names are listed explicitly. master_map = { - 'win_gpu': 'tryserver.chromium.gpu', 'chromium_presubmit': 'tryserver.chromium.linux', 'blink_presubmit': 'tryserver.chromium.linux', 'tools_build_presubmit': 'tryserver.chromium.linux', diff --git a/PRESUBMIT_test.py b/PRESUBMIT_test.py index 872545ebaa7940..5c93d982a76678 100755 --- a/PRESUBMIT_test.py +++ b/PRESUBMIT_test.py @@ -691,10 +691,6 @@ def testFailure(self): class TryServerMasterTest(unittest.TestCase): def testTryServerMasters(self): bots = { - 'tryserver.chromium.gpu': [ - 'win_gpu', - 'win_gpu_triggered_tests', - ], 'tryserver.chromium.mac': [ 'ios_dbg_simulator', 'ios_rel_device', diff --git a/gpu/PRESUBMIT.py b/gpu/PRESUBMIT.py deleted file mode 100644 index 53fc1535505007..00000000000000 --- a/gpu/PRESUBMIT.py +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (c) 2014 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -"""Top-level presubmit script for gpu/. - -See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts -for more details about the presubmit API built into depot_tools. -""" - -def GetPreferredTryMasters(project, change): - return { - 'tryserver.chromium.gpu': { - 'win_gpu': set(['defaulttests']), - } - }