Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 from slave.recipe_config import config_item_context, ConfigGroup | 5 from slave.recipe_config import config_item_context, ConfigGroup |
| 6 from slave.recipe_config import Dict, Single, Static | 6 from slave.recipe_config import Dict, Single, Static |
| 7 | 7 |
| 8 from slave.recipe_config_types import Path | |
|
agable
2013/09/26 21:46:02
No empty line above this.
iannucci
2013/09/27 02:08:20
Done.
| |
| 9 | |
| 8 def BaseConfig(INTERNAL, REPO_NAME, REPO_URL, **_kwargs): | 10 def BaseConfig(INTERNAL, REPO_NAME, REPO_URL, **_kwargs): |
| 9 return ConfigGroup( | 11 return ConfigGroup( |
| 10 INTERNAL = Static(INTERNAL), | 12 INTERNAL = Static(INTERNAL), |
| 11 REPO_NAME = Static(REPO_NAME), | 13 REPO_NAME = Static(REPO_NAME), |
| 12 REPO_URL = Static(REPO_URL), | 14 REPO_URL = Static(REPO_URL), |
| 13 target_arch = Single(basestring, required=False, empty_val=''), | 15 target_arch = Single(basestring, required=False, empty_val=''), |
| 14 extra_env = Dict(value_type=(basestring,int,list)), | 16 extra_env = Dict(value_type=(basestring,int,Path)), |
| 15 run_findbugs = Single(bool, required=False, empty_val=False), | 17 run_findbugs = Single(bool, required=False, empty_val=False), |
| 16 run_lint = Single(bool, required=False, empty_val=False), | 18 run_lint = Single(bool, required=False, empty_val=False), |
| 17 run_checkdeps = Single(bool, required=False, empty_val=False), | 19 run_checkdeps = Single(bool, required=False, empty_val=False), |
| 18 apply_svn_patch = Single(bool, required=False, empty_val=False) | 20 apply_svn_patch = Single(bool, required=False, empty_val=False), |
| 21 build_internal_android = Static(Path('build_internal', | |
| 22 'scripts', 'slave', 'android')) | |
| 19 ) | 23 ) |
| 20 | 24 |
| 21 | 25 |
| 22 VAR_TEST_MAP = { | 26 VAR_TEST_MAP = { |
| 23 'INTERNAL': [True, False], | 27 'INTERNAL': [True, False], |
| 24 'REPO_NAME': ['src', 'internal'], | 28 'REPO_NAME': ['src', 'internal'], |
| 25 'REPO_URL': ['bob_dot_org', 'mike_dot_org'], | 29 'REPO_URL': ['bob_dot_org', 'mike_dot_org'], |
| 26 } | 30 } |
| 27 | 31 |
| 28 def TEST_NAME_FORMAT(kwargs): | 32 def TEST_NAME_FORMAT(kwargs): |
| (...skipping 21 matching lines...) Expand all Loading... | |
| 50 pass | 54 pass |
| 51 | 55 |
| 52 @config_ctx() | 56 @config_ctx() |
| 53 def x86_builder(c): | 57 def x86_builder(c): |
| 54 c.target_arch = 'x86' | 58 c.target_arch = 'x86' |
| 55 | 59 |
| 56 @config_ctx() | 60 @config_ctx() |
| 57 def klp_builder(c): | 61 def klp_builder(c): |
| 58 c.extra_env = { | 62 c.extra_env = { |
| 59 'ANDROID_SDK_BUILD_TOOLS_VERSION': 'android-KeyLimePie', | 63 'ANDROID_SDK_BUILD_TOOLS_VERSION': 'android-KeyLimePie', |
| 60 'ANDROID_SDK_ROOT': ['third_party', 'android_tools_internal', 'sdk'], | 64 'ANDROID_SDK_ROOT': Path('checkout', 'third_party', |
| 65 'android_tools_internal', 'sdk'), | |
| 61 'ANDROID_SDK_VERSION': 'KeyLimePie' | 66 'ANDROID_SDK_VERSION': 'KeyLimePie' |
| 62 } | 67 } |
| 63 | 68 |
| 64 @config_ctx() | 69 @config_ctx() |
| 65 def try_builder(c): | 70 def try_builder(c): |
| 66 if c.INTERNAL: | 71 if c.INTERNAL: |
| 67 c.apply_svn_patch = True | 72 c.apply_svn_patch = True |
| 68 c.run_findbugs = True | 73 c.run_findbugs = True |
| 69 c.run_lint = True | 74 c.run_lint = True |
| 70 | 75 |
| 71 @config_ctx(includes=['x86_builder', 'try_builder']) | 76 @config_ctx(includes=['x86_builder', 'try_builder']) |
| 72 def x86_try_builder(c): | 77 def x86_try_builder(c): |
| 73 pass | 78 pass |
| OLD | NEW |