| 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 DEPS = [ | 7 DEPS = [ |
| 8 'bot_update', | 8 'bot_update', |
| 9 'chromium', | 9 'chromium', |
| 10 'chromium_tests', | 10 'chromium_tests', |
| (...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 127 # the runhooks step. | 127 # the runhooks step. |
| 128 api.chromium.runhooks() | 128 api.chromium.runhooks() |
| 129 | 129 |
| 130 # TODO(dpranke): Unify this with the logic in the chromium_trybot and | 130 # TODO(dpranke): Unify this with the logic in the chromium_trybot and |
| 131 # chromium recipes so that we can actually run the tests as well | 131 # chromium recipes so that we can actually run the tests as well |
| 132 # and deapply patches and retry as need be. | 132 # and deapply patches and retry as need be. |
| 133 test_spec_file = '%s.json' % mastername | 133 test_spec_file = '%s.json' % mastername |
| 134 test_spec = api.chromium_tests.read_test_spec(api, test_spec_file) | 134 test_spec = api.chromium_tests.read_test_spec(api, test_spec_file) |
| 135 | 135 |
| 136 tests = list(api.chromium_tests.steps.generate_gtest( | 136 tests = list(api.chromium_tests.steps.generate_gtest( |
| 137 api, mastername, buildername, test_spec)) | 137 api, api.chromium_tests, mastername, buildername, test_spec, |
| 138 bot_update_step)) |
| 138 | 139 |
| 139 scripts_compile_targets = \ | 140 scripts_compile_targets = \ |
| 140 api.chromium_tests.get_compile_targets_for_scripts().json.output | 141 api.chromium_tests.get_compile_targets_for_scripts().json.output |
| 141 tests += list(api.chromium_tests.steps.generate_script( | 142 tests += list(api.chromium_tests.steps.generate_script( |
| 142 api, mastername, buildername, test_spec, | 143 api, api.chromium_tests, mastername, buildername, test_spec, |
| 143 scripts_compile_targets=scripts_compile_targets)) | 144 bot_update_step, scripts_compile_targets=scripts_compile_targets)) |
| 144 | 145 |
| 145 additional_compile_targets = test_spec.get(buildername, {}).get( | 146 additional_compile_targets = test_spec.get(buildername, {}).get( |
| 146 'additional_compile_targets', | 147 'additional_compile_targets', |
| 147 ['chrome_public_apk' if is_android else 'all']) | 148 ['chrome_public_apk' if is_android else 'all']) |
| 148 | 149 |
| 149 if api.tryserver.is_tryserver: | 150 if api.tryserver.is_tryserver: |
| 150 affected_files = api.tryserver.get_files_affected_by_patch() | 151 affected_files = api.tryserver.get_files_affected_by_patch() |
| 151 | 152 |
| 152 test_targets = all_compile_targets(api, tests) | 153 test_targets = all_compile_targets(api, tests) |
| 153 | 154 |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 254 'gtest_tests': ['base_unittests'], | 255 'gtest_tests': ['base_unittests'], |
| 255 }})) + | 256 }})) + |
| 256 api.override_step_data( | 257 api.override_step_data( |
| 257 'analyze', | 258 'analyze', |
| 258 api.json.output({ | 259 api.json.output({ |
| 259 'status': 'Found dependency', | 260 'status': 'Found dependency', |
| 260 'test_targets': ['net_unittests'], | 261 'test_targets': ['net_unittests'], |
| 261 'compile_targets': ['net_unittests'], | 262 'compile_targets': ['net_unittests'], |
| 262 })) | 263 })) |
| 263 ) | 264 ) |
| OLD | NEW |