diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-27 19:17:52 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-27 19:17:52 +0000 |
| commit | d96b1f4d517393da7c19dc867692030bff20708d (patch) | |
| tree | cc461f8a10ff8a90aad1af48ad4ed6cf175a4af0 /PRESUBMIT.py | |
| parent | 259c289c91cc88e18be75b1b01adff5f11b00060 (diff) | |
| download | chromium_src-d96b1f4d517393da7c19dc867692030bff20708d.zip chromium_src-d96b1f4d517393da7c19dc867692030bff20708d.tar.gz chromium_src-d96b1f4d517393da7c19dc867692030bff20708d.tar.bz2 | |
Fix presubmit after my latest changes
This is a follow-up to https://codereview.chromium.org/179453003/
Removing CheckRietveldTryJobExecution because the implementation
is currently empty anyway and the trybot config will become more and more
dynamic so that static list is becoming less and less accurate.
BUG=317931
R=maruel@chromium.org
Review URL: https://codereview.chromium.org/183623002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253896 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'PRESUBMIT.py')
| -rw-r--r-- | PRESUBMIT.py | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/PRESUBMIT.py b/PRESUBMIT.py index b6f8c06..d9f21b9 100644 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py @@ -1352,10 +1352,6 @@ def CheckChangeOnCommit(input_api, output_api): input_api, output_api, json_url='http://chromium-status.appspot.com/current?format=json')) - results.extend(input_api.canned_checks.CheckRietveldTryJobExecution(input_api, - output_api, 'http://codereview.chromium.org', - ('win_rel', 'linux_rel', 'mac_rel, win:compile'), - 'tryserver@chromium.org')) results.extend(input_api.canned_checks.CheckChangeHasBugField( input_api, output_api)) @@ -1372,7 +1368,11 @@ def GetPreferredTrySlaves(project, change): return [] if all(re.search('\.(m|mm)$|(^|[/_])mac[/_.]', f) for f in files): - return GetDefaultTryConfigs(['mac', 'mac_rel']) + return GetDefaultTryConfigs([ + 'mac_chromium_compile_dbg', + 'mac_chromium_rel', + 'mac_rel' + ]) if all(re.search('(^|[/_])win[/_.]', f) for f in files): return GetDefaultTryConfigs(['win', 'win_rel']) if all(re.search('(^|[/_])android[/_.]', f) for f in files): @@ -1391,12 +1391,14 @@ def GetPreferredTrySlaves(project, change): 'ios_rel_device', 'linux_gtk', 'linux_asan', - 'linux_chromeos', - 'linux_clang', + 'linux_chromium_chromeos_rel', + 'linux_chromium_clang_dbg', 'linux_nacl_sdk_build', + 'linux_chromium_rel', 'linux_rel', - 'mac', + 'mac_chromium_compile_dbg', 'mac_nacl_sdk_build', + 'mac_chromium_rel', 'mac_rel', 'win', 'win_nacl_sdk_build', @@ -1408,7 +1410,7 @@ def GetPreferredTrySlaves(project, change): # Same for chromeos. if any(re.search('[/_](aura|chromeos)', f) for f in files): trybots.extend(GetDefaultTryConfigs([ - 'linux_chromeos_asan', 'linux_chromeos_clang'])) + 'linux_chromeos_asan', 'linux_chromium_chromeos_clang_dbg'])) # 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 |