chromium/src
0
Fork 0
Code Activity

Revert 233509 "Sync PRESUBMIT.py with what is run on CQ."

Browse Source 
This broke git cl try

> Sync PRESUBMIT.py with what is run on CQ.
> 
> This is a repeat of https://chromiumcodereview.appspot.com/11553016/, using the
> New Advanced Technology™ in https://chromiumcodereview.appspot.com/54373011/.
> 
> BUG=278554
> R=maruel@chromium.org
> 
> Review URL: https://codereview.chromium.org/58803002

TBR=stip@chromium.org

Review URL: https://codereview.chromium.org/64473002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233609 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
jochen@chromium.org
2013-11-07 14:08:50 +00:00
parent 6297d0a462
commit 49da83c68f
1 changed files with 14 additions and 185 deletions

199
PRESUBMIT.py

@ -1003,166 +1003,6 @@ def CheckChangeOnUpload(input_api, output_api):
return results
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
/chrome/trunk/tools/build/masters/master.chromium/master_gatekeeper_cfg.py.
If 'bots' is specified, will only return configurations for bots in that list.
"""
standard_tests = [
'base_unittests',
'browser_tests',
'cacheinvalidation_unittests',
'check_deps',
'content_browsertests',
'content_unittests',
'crypto_unittests',
#'gfx_unittests',
'gpu_unittests',
'ipc_tests',
'interactive_ui_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',
]
# Use a smaller set of tests for *_aura, since there's a lot of overlap with
# the corresponding *_rel builders.
# Note: *_aura are Release builders even if their names convey otherwise.
aura_tests = [
'app_list_unittests',
'aura_unittests',
'browser_tests',
'compositor_unittests',
'content_browsertests',
'content_unittests',
'interactive_ui_tests',
'unit_tests',
'views_unittests',
]
linux_aura_tests = aura_tests[:]
linux_aura_tests.remove('views_unittests')
win7_aura_tests = aura_tests[:]
win7_aura_tests.remove('app_list_unittests')
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_dbg': ['slave_steps'],
'android_clang_dbg': ['slave_steps'],
'android_aosp': ['compile'],
'ios_dbg_simulator': [
'compile',
'base_unittests',
'content_unittests',
'crypto_unittests',
'url_unittests',
'net_unittests',
'sql_unittests',
'ui_unittests',
],
'ios_rel_device': ['compile'],
'linux_aura': linux_aura_tests,
'linux_asan': ['defaulttests'],
'linux_clang': ['compile'],
'linux_chromeos_clang': ['compile'],
# Note: It is a Release builder even if its name convey otherwise.
'linux_chromeos': standard_tests + [
'app_list_unittests',
'aura_unittests',
'ash_unittests',
'chromeos_unittests',
'components_unittests',
'dbus_unittests',
'device_unittests',
'sandbox_linux_unittests',
],
'linux_rel': standard_tests + [
'cc_unittests',
'chromedriver2_unittests',
'components_unittests',
'nacl_integration',
'remoting_unittests',
'sandbox_linux_unittests',
'sync_integration_tests',
],
'mac': ['compile'],
'mac_rel': standard_tests + [
'app_list_unittests',
'cc_unittests',
'chromedriver2_unittests',
'components_unittests',
'google_apis_unittests',
'message_center_unittests',
'nacl_integration',
'remoting_unittests',
'sync_integration_tests',
'telemetry_unittests',
],
'win': ['compile'],
'win7_aura': win7_aura_tests + [
'ash_unittests',
],
'win_rel': standard_tests + [
'app_list_unittests',
'cc_unittests',
'chrome_frame_net_tests',
'chrome_frame_tests',
'chrome_frame_unittests',
'chromedriver2_unittests',
'components_unittests',
'installer_util_unittests',
'mini_installer_test',
'nacl_integration',
'remoting_unittests',
'sync_integration_tests',
'telemetry_unittests',
],
'win_x64_rel': [
'base_unittests',
],
}
swarm_enabled_builders = (
'linux_rel',
'mac_rel',
)
swarm_enabled_tests = (
'base_unittests',
'browser_tests',
'interactive_ui_tests',
'net_unittests',
'unit_tests',
)
for bot in builders_and_tests:
if bot in swarm_enabled_builders:
builders_and_tests[bot] = [x + '_swarm' if x in swarm_enabled_tests else x
for x in builders_and_tests[bot]]
if bots:
return [(bot, set(builders_and_tests[bot])) for bot in bots]
else:
return [(bot, set(tests)) for bot, tests in builders_and_tests.iteritems()]
def CheckChangeOnCommit(input_api, output_api):
results = []
results.extend(_CommonChecks(input_api, output_api))
@ -1194,27 +1034,17 @@ def GetPreferredTrySlaves(project, change):
return []
if all(re.search('\.(m|mm)$|(^|[/_])mac[/_.]', f) for f in files):
return GetDefaultTryConfigs(['mac_rel']) + [
('mac', set(['compile']))]
return ['mac_rel', 'mac:compile']
if all(re.search('(^|[/_])win[/_.]', f) for f in files):
return GetDefaultTryConfigs(['win_rel', 'win7_aura']) + [
('win', set(['compile']))]
return ['win_rel', 'win7_aura', 'win:compile']
if all(re.search('(^|[/_])android[/_.]', f) for f in files):
return GetDefaultTryConfigs([
'android_aosp',
'android_clang_dbg',
'android_dbg',
])
return ['android_aosp', 'android_dbg', 'android_clang_dbg']
if all(re.search('^native_client_sdk', f) for f in files):
return GetDefaultTryConfigs([
'linux_nacl_sdk',
'mac_nacl_sdk',
'win_nacl_sdk',
])
return ['linux_nacl_sdk', 'win_nacl_sdk', 'mac_nacl_sdk']
if all(re.search('[/_]ios[/_.]', f) for f in files):
return GetDefaultTryConfigs(['ios_rel_device', 'ios_dbg_simulator'])
return ['ios_rel_device', 'ios_dbg_simulator']
trybots = GetDefaultTryConfigs([
trybots = [
'android_clang_dbg',
'android_dbg',
'ios_dbg_simulator',
@ -1222,21 +1052,20 @@ def GetPreferredTrySlaves(project, change):
'linux_asan',
'linux_aura',
'linux_chromeos',
'linux_clang',
'linux_clang:compile',
'linux_rel',
'mac',
'mac_rel',
'win',
'mac:compile',
'win7_aura',
'win_rel',
'win_x64_rel',
])
'win:compile',
'win_x64_rel:base_unittests',
]
# Match things like path/aura/file.cc and path/file_aura.cc.
# Same for chromeos.
if any(re.search('[/_](aura|chromeos)', f) for f in files):
trybots.extend(GetDefaultTryConfigs(['linux_chromeos_clang']))
trybots.append(('linux_chromeos_asan', set(['defaulttests'])))
trybots += ['linux_chromeos_clang:compile', 'linux_chromeos_asan']
# If there are gyp changes to base, build, or chromeos, run a full cros build
# in addition to the shorter linux_chromeos build. Changes to high level gyp
@ -1244,13 +1073,13 @@ def GetPreferredTrySlaves(project, change):
# differnt from the linux_chromeos build that most chrome developers test
# with.
if any(re.search('^(base|build|chromeos).*\.gypi?$', f) for f in files):
trybots.append(('cros_x86', set(['defaulttests'])))
trybots += ['cros_x86']
# The AOSP bot doesn't build the chrome/ layer, so ignore any changes to it
# unless they're .gyp(i) files as changes to those files can break the gyp
# step on that bot.
if (not all(re.search('^chrome', f) for f in files) or
any(re.search('\.gypi?$', f) for f in files)):
trybots.extend(GetDefaultTryConfigs(['android_aosp']))
trybots += ['android_aosp']
return trybots