| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 """Chromium presubmit script for src/net. | 5 """Chromium presubmit script for src/net. |
| 6 | 6 |
| 7 See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts | 7 See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts |
| 8 for more details on the presubmit API built into gcl. | 8 for more details on the presubmit API built into gcl. |
| 9 """ | 9 """ |
| 10 | 10 |
| 11 def GetPreferredTrySlaves(project, change): | 11 def GetPreferredTryMasters(project, change): |
| 12 slaves = [ | 12 masters = { |
| 13 'linux_rel:sync_integration_tests', | 13 'tryserver.chromium': { |
| 14 'mac_rel:sync_integration_tests', | 14 'linux_rel': set(['sync_integration_tests']), |
| 15 'win_rel:sync_integration_tests', | 15 'mac_rel': set(['sync_integration_tests']), |
| 16 ] | 16 'win_rel': set(['sync_integration_tests']), |
| 17 } |
| 18 } |
| 17 # Changes that touch NSS files will likely need a corresponding OpenSSL edit. | 19 # Changes that touch NSS files will likely need a corresponding OpenSSL edit. |
| 18 # Conveniently, this one glob also matches _openssl.* changes too. | 20 # Conveniently, this one glob also matches _openssl.* changes too. |
| 19 if any('nss' in f.LocalPath() for f in change.AffectedFiles()): | 21 if any('nss' in f.LocalPath() for f in change.AffectedFiles()): |
| 20 slaves.append('linux_redux') | 22 masters['tryserver.chromium'].setdefault( |
| 21 return slaves | 23 'linux_redux', set()).add('defaulttests') |
| 24 return masters |
| OLD | NEW |