summaryrefslogtreecommitdiffstats
path: root/PRESUBMIT.py
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-15 09:32:43 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-15 09:32:43 +0000
commitc17144e4dc743fe49ef5fd2599914401c3d21d9e (patch)
tree92258f8c939cd712d457cfff43b8e936d1b28f66 /PRESUBMIT.py
parent471eeb53f64b1e576a42579a8cfd3f3376eef57e (diff)
downloadchromium_src-c17144e4dc743fe49ef5fd2599914401c3d21d9e.zip
chromium_src-c17144e4dc743fe49ef5fd2599914401c3d21d9e.tar.gz
chromium_src-c17144e4dc743fe49ef5fd2599914401c3d21d9e.tar.bz2
Sync PRESUBMIT files with latest CQ changes
BUG=none R=maruel@chromium.org Review URL: https://codereview.chromium.org/237383002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263810 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'PRESUBMIT.py')
-rw-r--r--PRESUBMIT.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index 7c9408b..1fa3d1c 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -1337,6 +1337,8 @@ def GetDefaultTryConfigs(bots=None):
],
'win': ['compile'],
'win_chromium_compile_dbg': ['defaulttests'],
+ 'win_chromium_dbg': ['defaulttests'],
+ 'win_chromium_rel': ['defaulttests'],
'win_nacl_sdk_build': ['compile'],
'win_rel': standard_tests + [
'app_list_unittests',
@@ -1429,7 +1431,7 @@ def GetPreferredTryMasters(project, change):
'mac_chromium_rel',
])
if all(re.search('(^|[/_])win[/_.]', f) for f in files):
- return GetDefaultTryConfigs(['win', 'win_rel'])
+ return GetDefaultTryConfigs(['win_chromium_dbg', 'win_chromium_rel'])
if all(re.search('(^|[/_])android[/_.]', f) for f in files):
return GetDefaultTryConfigs([
'android_aosp',
@@ -1450,7 +1452,7 @@ def GetPreferredTryMasters(project, change):
'mac_chromium_compile_dbg',
'mac_chromium_rel',
'win_chromium_compile_dbg',
- 'win_rel',
+ 'win_chromium_rel',
'win_x64_rel',
]