| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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 recipe_engine.types import freeze | 5 from recipe_engine.types import freeze |
| 6 | 6 |
| 7 | 7 |
| 8 DEPS = [ | 8 DEPS = [ |
| 9 'adb', | 9 'adb', |
| 10 'bot_update', | 10 'bot_update', |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 133 # (1) the revision of the builder, | 133 # (1) the revision of the builder, |
| 134 # (2) 'revision' from the waterfall, or | 134 # (2) 'revision' from the waterfall, or |
| 135 # (3) 'HEAD' for forced builds with unspecified 'revision'. | 135 # (3) 'HEAD' for forced builds with unspecified 'revision'. |
| 136 # TODO(machenbach): Use parent_got_cr_revision on testers with component | 136 # TODO(machenbach): Use parent_got_cr_revision on testers with component |
| 137 # builds to match also the chromium revision from the builder. | 137 # builds to match also the chromium revision from the builder. |
| 138 component_rev = api.properties.get( | 138 component_rev = api.properties.get( |
| 139 'parent_got_revision', api.properties.get('revision') or 'HEAD') | 139 'parent_got_revision', api.properties.get('revision') or 'HEAD') |
| 140 dep = builder.get('set_component_rev') | 140 dep = builder.get('set_component_rev') |
| 141 api.gclient.c.revisions[dep['name']] = dep['rev_str'] % component_rev | 141 api.gclient.c.revisions[dep['name']] = dep['rev_str'] % component_rev |
| 142 | 142 |
| 143 api.bot_update.ensure_checkout() | 143 bot_update_step = api.bot_update.ensure_checkout() |
| 144 | 144 |
| 145 test_spec_file = builder.get('test_spec_file') | 145 test_spec_file = builder.get('test_spec_file') |
| 146 test_spec = {} | 146 test_spec = {} |
| 147 if test_spec_file: | 147 if test_spec_file: |
| 148 test_spec = api.chromium_tests.read_test_spec(api, test_spec_file) | 148 test_spec = api.chromium_tests.read_test_spec(api, test_spec_file) |
| 149 | 149 |
| 150 scripts_compile_targets = \ | 150 scripts_compile_targets = \ |
| 151 api.chromium_tests.get_compile_targets_for_scripts().json.output | 151 api.chromium_tests.get_compile_targets_for_scripts().json.output |
| 152 | 152 |
| 153 builder['tests'] = api.chromium_tests.generate_tests_from_test_spec( | 153 builder['tests'] = api.chromium_tests.generate_tests_from_test_spec( |
| 154 api, test_spec, builder, buildername, mastername, False, | 154 api, test_spec, builder, buildername, mastername, False, |
| 155 scripts_compile_targets, [api.chromium_tests.steps.generate_script]) | 155 scripts_compile_targets, [api.chromium_tests.steps.generate_script], |
| 156 bot_update_step) |
| 156 | 157 |
| 157 api.path['checkout'] = api.path['slave_build'].join('src') | 158 api.path['checkout'] = api.path['slave_build'].join('src') |
| 158 api.chromium_android.clean_local_files() | 159 api.chromium_android.clean_local_files() |
| 159 | 160 |
| 160 api.chromium_android.download_build(bucket=builder['bucket'], | 161 api.chromium_android.download_build(bucket=builder['bucket'], |
| 161 path=builder['path'](api)) | 162 path=builder['path'](api)) |
| 162 | 163 |
| 163 api.chromium_android.common_tests_setup_steps(perf_setup=True) | 164 api.chromium_android.common_tests_setup_steps(perf_setup=True) |
| 164 | 165 |
| 165 api.chromium_android.adb_install_apk('ChromePublic.apk') | 166 api.chromium_android.adb_install_apk('ChromePublic.apk') |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 281 mastername='chromium.perf', | 282 mastername='chromium.perf', |
| 282 buildername='Android Nexus5 Perf (1)', | 283 buildername='Android Nexus5 Perf (1)', |
| 283 parent_buildername='parent_buildername', | 284 parent_buildername='parent_buildername', |
| 284 parent_buildnumber='1729', | 285 parent_buildnumber='1729', |
| 285 parent_revision='deadbeef', | 286 parent_revision='deadbeef', |
| 286 revision='deadbeef', | 287 revision='deadbeef', |
| 287 slavename='slavename', | 288 slavename='slavename', |
| 288 target='Release') + | 289 target='Release') + |
| 289 api.override_step_data( | 290 api.override_step_data( |
| 290 'perf_test.foo', retcode=87)) | 291 'perf_test.foo', retcode=87)) |
| OLD | NEW |