diff options
| -rw-r--r-- | PRESUBMIT.py | 107 | ||||
| -rw-r--r-- | chrome/browser/policy/PRESUBMIT.py | 16 | ||||
| -rw-r--r-- | chrome/browser/ui/views/PRESUBMIT.py | 16 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/PRESUBMIT.py | 16 | ||||
| -rw-r--r-- | crypto/PRESUBMIT.py | 17 | ||||
| -rw-r--r-- | extensions/browser/PRESUBMIT.py | 7 | ||||
| -rwxr-xr-x | third_party/tcmalloc/PRESUBMIT.py | 16 | ||||
| -rw-r--r-- | tools/valgrind/memcheck/PRESUBMIT.py | 10 | ||||
| -rw-r--r-- | ui/compositor/PRESUBMIT.py | 16 | ||||
| -rw-r--r-- | ui/events/PRESUBMIT.py | 12 |
10 files changed, 8 insertions, 225 deletions
diff --git a/PRESUBMIT.py b/PRESUBMIT.py index ad723a8..d41cc75 100644 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py @@ -1626,112 +1626,15 @@ def GetTryServerMasterForBot(bot): return master -def GetDefaultTryConfigs(bots=None): - """Returns a list of ('bot', set(['tests']), optionally filtered by [bots]. - - To add tests to this list, they MUST be in the the corresponding master's - gatekeeper config. For example, anything on master.chromium would be closed by - tools/build/masters/master.chromium/master_gatekeeper_cfg.py. - - If 'bots' is specified, will only return configurations for bots in that list. +def GetDefaultTryConfigs(bots): + """Returns a list of ('bot', set(['tests']), filtered by [bots]. """ - standard_tests = [ - 'base_unittests', - 'browser_tests', - 'cacheinvalidation_unittests', - 'check_deps', - 'check_deps2git', - 'content_browsertests', - 'content_unittests', - 'crypto_unittests', - 'gpu_unittests', - 'interactive_ui_tests', - 'ipc_tests', - 'jingle_unittests', - 'media_unittests', - 'net_unittests', - 'ppapi_unittests', - 'printing_unittests', - 'sql_unittests', - 'sync_unit_tests', - 'unit_tests', - # Broken in release. - #'url_unittests', - #'webkit_unit_tests', - ] - - builders_and_tests = { - # TODO(maruel): Figure out a way to run 'sizes' where people can - # effectively update the perf expectation correctly. This requires a - # clobber=True build running 'sizes'. 'sizes' is not accurate with - # incremental build. Reference: - # http://chromium.org/developers/tree-sheriffs/perf-sheriffs. - # TODO(maruel): An option would be to run 'sizes' but not count a failure - # of this step as a try job failure. - 'android_aosp': ['compile'], - 'android_arm64_dbg_recipe': ['slave_steps'], - 'android_chromium_gn_compile_dbg': ['compile'], - 'android_chromium_gn_compile_rel': ['compile'], - 'android_clang_dbg_recipe': ['slave_steps'], - 'android_dbg_tests_recipe': ['slave_steps'], - 'ios_dbg_simulator': [ - 'compile', - 'base_unittests', - 'content_unittests', - 'crypto_unittests', - 'url_unittests', - 'net_unittests', - 'sql_unittests', - 'ui_base_unittests', - ], - 'ios_rel_device': ['compile'], - 'ios_rel_device_ninja': ['compile'], - 'mac_asan': ['compile'], - #TODO(stip): Change the name of this builder to reflect that it's release. - 'linux_gtk': standard_tests, - 'linux_chromeos_asan': ['compile'], - 'linux_chromium_asan_rel': ['defaulttests'], - 'linux_chromium_chromeos_clang_dbg': ['defaulttests'], - 'linux_chromium_chromeos_compile_dbg_ng': ['defaulttests'], - 'linux_chromium_chromeos_rel': ['defaulttests'], - 'linux_chromium_chromeos_rel_ng': ['defaulttests'], - 'linux_chromium_compile_dbg': ['defaulttests'], - 'linux_chromium_compile_dbg_32_ng': ['compile'], - 'linux_chromium_gn_dbg': ['compile'], - 'linux_chromium_gn_rel': ['defaulttests'], - 'linux_chromium_rel': ['defaulttests'], - 'linux_chromium_rel_ng': ['defaulttests'], - 'linux_chromium_clang_dbg': ['defaulttests'], - 'linux_gpu': ['defaulttests'], - 'linux_nacl_sdk_build': ['compile'], - 'mac_chromium_compile_dbg': ['defaulttests'], - 'mac_chromium_compile_dbg_ng': ['defaulttests'], - 'mac_chromium_rel': ['defaulttests'], - 'mac_chromium_rel_ng': ['defaulttests'], - 'mac_nacl_sdk_build': ['compile'], - 'win_chromium_compile_dbg': ['defaulttests'], - 'win_chromium_dbg': ['defaulttests'], - 'win_chromium_rel': ['defaulttests'], - 'win_chromium_rel_ng': ['defaulttests'], - 'win_chromium_x64_rel': ['defaulttests'], - 'win_chromium_x64_rel_ng': ['defaulttests'], - 'win_gpu': ['defaulttests'], - 'win_nacl_sdk_build': ['compile'], - 'win8_chromium_rel': ['defaulttests'], - } - - if bots: - filtered_builders_and_tests = dict((bot, set(builders_and_tests[bot])) - for bot in bots) - else: - filtered_builders_and_tests = dict( - (bot, set(tests)) - for bot, tests in builders_and_tests.iteritems()) + builders_and_tests = dict((bot, set(['defaulttests'])) for bot in bots) # Build up the mapping from tryserver master to bot/test. out = dict() - for bot, tests in filtered_builders_and_tests.iteritems(): + for bot, tests in builders_and_tests.iteritems(): out.setdefault(GetTryServerMasterForBot(bot), {})[bot] = tests return out @@ -1815,7 +1718,7 @@ def GetPreferredTryMasters(project, change): # Same for chromeos. if any(re.search(r'[\\\/_](aura|chromeos)', f) for f in files): builders.extend([ - 'linux_chromeos_asan', + 'linux_chromium_chromeos_asan_rel_ng', ]) return GetDefaultTryConfigs(builders) diff --git a/chrome/browser/policy/PRESUBMIT.py b/chrome/browser/policy/PRESUBMIT.py deleted file mode 100644 index 7230b5e..0000000 --- a/chrome/browser/policy/PRESUBMIT.py +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (c) 2012 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. - -"""Chromium presubmit script for chrome/browser/policy. - -See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts -for more details on the presubmit API built into gcl. -""" - -def GetPreferredTryMasters(project, change): - return { - 'tryserver.chromium.linux': { - 'linux_chromium_chromeos_rel': set(['defaulttests']), - } - } diff --git a/chrome/browser/ui/views/PRESUBMIT.py b/chrome/browser/ui/views/PRESUBMIT.py deleted file mode 100644 index 49c28be..0000000 --- a/chrome/browser/ui/views/PRESUBMIT.py +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (c) 2012 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. - -"""Chromium presubmit script for src/chrome/browser/view. - -See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts -for more details on the presubmit API built into gcl. -""" - -def GetPreferredTryMasters(project, change): - return { - 'tryserver.chromium.linux': { - 'linux_chromium_chromeos_rel': set(['defaulttests']), - } - } diff --git a/chrome/browser/ui/webui/PRESUBMIT.py b/chrome/browser/ui/webui/PRESUBMIT.py deleted file mode 100644 index ca67923..0000000 --- a/chrome/browser/ui/webui/PRESUBMIT.py +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (c) 2012 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. - -"""Chromium presubmit script for src/chrome/browser/externsions. - -See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts -for more details on the presubmit API built into gcl. -""" - -def GetPreferredTryMasters(project, change): - return { - 'tryserver.chromium.linux': { - 'linux_chromium_chromeos_rel': set(['defaulttests']), - } - } diff --git a/crypto/PRESUBMIT.py b/crypto/PRESUBMIT.py deleted file mode 100644 index a2a5af9..0000000 --- a/crypto/PRESUBMIT.py +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (c) 2012 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. - -"""Chromium presubmit script for src/net. - -See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts -for more details on the presubmit API built into gcl. -""" - -def GetPreferredTryMasters(project, change): - # Changes in crypto often need a corresponding OpenSSL edit. - return { - 'tryserver.chromium.linux': { - 'linux_redux': set(['defaulttests']), - } - } diff --git a/extensions/browser/PRESUBMIT.py b/extensions/browser/PRESUBMIT.py index 689b8ad37..4cddbe2 100644 --- a/extensions/browser/PRESUBMIT.py +++ b/extensions/browser/PRESUBMIT.py @@ -10,13 +10,6 @@ for more details on the presubmit API built into gcl. import sys -def GetPreferredTryMasters(project, change): - return { - 'tryserver.chromium.linux': { - 'linux_chromium_chromeos_rel': set(['defaulttests']), - } - } - def _CreateHistogramValueChecker(input_api, output_api): original_sys_path = sys.path diff --git a/third_party/tcmalloc/PRESUBMIT.py b/third_party/tcmalloc/PRESUBMIT.py deleted file mode 100755 index dccfde6..0000000 --- a/third_party/tcmalloc/PRESUBMIT.py +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (c) 2009 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. - -"""Chromium presubmit script for third_party/tcmalloc. - -See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts -for more details on the presubmit API built into gcl. -""" - -def GetPreferredTryMasters(project, change): - return { - 'tryserver.chromium.linux': { - 'linux_valgrind': set(['defaulttests']), - } - } diff --git a/tools/valgrind/memcheck/PRESUBMIT.py b/tools/valgrind/memcheck/PRESUBMIT.py index b556e63..64683d5 100644 --- a/tools/valgrind/memcheck/PRESUBMIT.py +++ b/tools/valgrind/memcheck/PRESUBMIT.py @@ -76,13 +76,3 @@ def CheckChangeOnUpload(input_api, output_api): def CheckChangeOnCommit(input_api, output_api): return CheckChange(input_api, output_api) - -def GetPreferredTryMasters(project, change): - return { - 'tryserver.chromium.linux': { - 'linux_valgrind': set(['defaulttests']), - }, - 'tryserver.chromium.mac': { - 'mac_valgrind': set(['defaulttests']), - } - } diff --git a/ui/compositor/PRESUBMIT.py b/ui/compositor/PRESUBMIT.py deleted file mode 100644 index 6bc103c..0000000 --- a/ui/compositor/PRESUBMIT.py +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (c) 2012 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. - -"""Chromium presubmit script for src/ui/compositor/. - -See http://dev.chromium.org/developers/how-tos/depottools/presubmit-scripts -for more details on the presubmit API built into gcl. -""" - -def GetPreferredTryMasters(project, change): - return { - 'tryserver.chromium.linux': { - 'linux_chromium_chromeos_rel': set(['defaulttests']), - } - } diff --git a/ui/events/PRESUBMIT.py b/ui/events/PRESUBMIT.py index 345bf08..21b49a7 100644 --- a/ui/events/PRESUBMIT.py +++ b/ui/events/PRESUBMIT.py @@ -9,18 +9,12 @@ for more details on the presubmit API built into gcl. """ def GetPreferredTryMasters(project, change): - tests = set(['ash_unittests', - 'aura_unittests', - 'events_unittests', - 'keyboard_unittests', - 'views_unittests']) - return { 'tryserver.chromium.linux': { - 'linux_chromium_chromeos_rel': tests, - 'linux_chromeos_asan': tests, + 'linux_chromium_chromeos_rel_ng': set(['defaulttests']), + 'linux_chromium_chromeos_asan_rel_ng': set(['defaulttests']), }, 'tryserver.chromium.win': { - 'win_chromium_compile_dbg': tests, + 'win_chromium_compile_dbg': set(['defaulttests']), } } |