diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-03-21 14:25:57 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-03-21 14:25:57 +0000 |
| commit | 23730a6e56a168d1879203e4b3819bb36e3d8f1f (patch) | |
| tree | 4b72bdd217f9beda1d1b975e21c9d646a9664c48 /PRESUBMIT.py | |
| parent | 6d6d338a36340632714f2aab9a266979b71c3442 (diff) | |
| download | chromium_org-23730a6e56a168d1879203e4b3819bb36e3d8f1f.tar.gz | |
Merge from Chromium at DEPS revision 258528
This commit was generated by merge_to_master.py.
Change-Id: Id197cbdde2c2881915f096c0426c741416884783
Diffstat (limited to 'PRESUBMIT.py')
| -rw-r--r-- | PRESUBMIT.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/PRESUBMIT.py b/PRESUBMIT.py index 19d14c47bd..326178cb11 100644 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py @@ -240,6 +240,7 @@ _BANNED_CPP_FUNCTIONS = ( _VALID_OS_MACROS = ( # Please keep sorted. 'OS_ANDROID', + 'OS_ANDROID_HOST', 'OS_BSD', 'OS_CAT', # For testing. 'OS_CHROMEOS', @@ -1301,10 +1302,11 @@ def GetDefaultTryConfigs(bots=None): 'ui_unittests', ], 'ios_rel_device': ['compile'], - 'linux_asan': ['defaulttests'], + 'linux_asan': ['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': ['defaulttests'], + 'linux_chromeos_asan': ['compile'], 'linux_chromium_chromeos_clang_dbg': ['defaulttests'], 'linux_chromium_chromeos_rel': ['defaulttests'], 'linux_chromium_compile_dbg': ['defaulttests'], @@ -1352,9 +1354,10 @@ def GetDefaultTryConfigs(bots=None): } swarm_enabled_builders = ( - 'linux_rel', - 'mac_rel', - 'win_rel', + # http://crbug.com/354263 + # 'linux_rel', + # 'mac_rel', + # 'win_rel', ) swarm_enabled_tests = ( |