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 recipe_engine.types import freeze | 5 from recipe_engine.types import freeze |
6 from recipe_engine import recipe_api | 6 from recipe_engine import recipe_api |
7 from . import builders | 7 from . import builders |
8 from . import steps | 8 from . import steps |
9 | 9 |
10 | 10 |
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
176 self.c.enable_swarming) | 176 self.c.enable_swarming) |
177 with self.m.step.defer_results(): | 177 with self.m.step.defer_results(): |
178 if tests: | 178 if tests: |
179 if self.m.chromium.c.TARGET_PLATFORM == 'android': | 179 if self.m.chromium.c.TARGET_PLATFORM == 'android': |
180 self.m.chromium_android.common_tests_setup_steps() | 180 self.m.chromium_android.common_tests_setup_steps() |
181 | 181 |
182 for test in tests: | 182 for test in tests: |
183 test.run(self, suffix='') | 183 test.run(self, suffix='') |
184 | 184 |
185 if self.m.chromium.c.TARGET_PLATFORM == 'android': | 185 if self.m.chromium.c.TARGET_PLATFORM == 'android': |
186 self.m.chromium_android.common_tests_final_steps() | 186 self.m.chromium_android.shutdown_device_monitor() |
| 187 self.m.chromium_android.logcat_dump(gs_bucket='chromium-android') |
| 188 self.m.chromium_android.stack_tool_steps(force_latest_version=True) |
| 189 self.m.chromium_android.test_report() |
187 | 190 |
188 with self.m.step.defer_results(): | 191 with self.m.step.defer_results(): |
189 for test in tests: | 192 for test in tests: |
190 if test.enable_swarming: | 193 if test.enable_swarming: |
191 self.m.swarming.collect_task(test.swarming_task) | 194 self.m.swarming.collect_task(test.swarming_task) |
192 | 195 |
193 | 196 |
194 def add_test(self, test, name=None, args=None, revision=None, env=None, | 197 def add_test(self, test, name=None, args=None, revision=None, env=None, |
195 python_mode=False, perf_test=False, perf_dashboard_id=None, | 198 python_mode=False, perf_test=False, perf_dashboard_id=None, |
196 parallel=True): | 199 parallel=True): |
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
293 def clean_test_output(self): | 296 def clean_test_output(self): |
294 """Remove all test output in out/, since we have tests leaking files.""" | 297 """Remove all test output in out/, since we have tests leaking files.""" |
295 out_dir = self.m.path['checkout'].join('out') | 298 out_dir = self.m.path['checkout'].join('out') |
296 self.m.python('clean test output files', | 299 self.m.python('clean test output files', |
297 script=self.resource('cleanup_files.py'), | 300 script=self.resource('cleanup_files.py'), |
298 args=[out_dir], | 301 args=[out_dir], |
299 infra_step=True) | 302 infra_step=True) |
300 | 303 |
301 def virtual_webcam_check(self): | 304 def virtual_webcam_check(self): |
302 self.m.python('webcam_check', self.resource('ensure_webcam_is_running.py')) | 305 self.m.python('webcam_check', self.resource('ensure_webcam_is_running.py')) |
OLD | NEW |