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 import collections | 5 import collections |
6 import contextlib | 6 import contextlib |
7 import copy | 7 import copy |
8 import itertools | 8 import itertools |
9 import json | 9 import json |
10 | 10 |
(...skipping 598 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
609 remove_system_webview=remove_system_webview) | 609 remove_system_webview=remove_system_webview) |
610 | 610 |
611 try: | 611 try: |
612 yield | 612 yield |
613 finally: | 613 finally: |
614 if self.m.platform.is_win: | 614 if self.m.platform.is_win: |
615 self.m.chromium.process_dumps() | 615 self.m.chromium.process_dumps() |
616 | 616 |
617 if self.m.chromium.c.TARGET_PLATFORM == 'android': | 617 if self.m.chromium.c.TARGET_PLATFORM == 'android': |
618 if require_device_steps: | 618 if require_device_steps: |
619 self.m.chromium_android.common_tests_final_steps( | 619 self.m.chromium_android.logcat_gs_bucket = 'chromium-android' |
jbudorick
2016/11/08 00:18:31
If this is the default, why do we need to specify
| |
620 logcat_gs_bucket='chromium-android') | 620 self.m.chromium_android.common_tests_final_steps() |
621 else: | 621 else: |
622 self.m.chromium_android.test_report() | 622 self.m.chromium_android.test_report() |
623 | 623 |
624 def _resolve_fixed_revisions(self, bot_update_json): | 624 def _resolve_fixed_revisions(self, bot_update_json): |
625 """Set all fixed revisions from the first sync to their respective | 625 """Set all fixed revisions from the first sync to their respective |
626 got_X_revision values. | 626 got_X_revision values. |
627 | 627 |
628 If on the first sync, a revision was requested to be HEAD, this avoids | 628 If on the first sync, a revision was requested to be HEAD, this avoids |
629 using HEAD potentially resolving to a different revision on the second | 629 using HEAD potentially resolving to a different revision on the second |
630 sync. Instead, we sync explicitly to whatever was checked out the first | 630 sync. Instead, we sync explicitly to whatever was checked out the first |
(...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1015 targets in |compile_targets|.""" | 1015 targets in |compile_targets|.""" |
1016 result = [] | 1016 result = [] |
1017 for test in tests: | 1017 for test in tests: |
1018 test_compile_targets = test.compile_targets(api) | 1018 test_compile_targets = test.compile_targets(api) |
1019 # Always return tests that don't require compile. Otherwise we'd never | 1019 # Always return tests that don't require compile. Otherwise we'd never |
1020 # run them. | 1020 # run them. |
1021 if ((set(compile_targets) & set(test_compile_targets)) or | 1021 if ((set(compile_targets) & set(test_compile_targets)) or |
1022 not test_compile_targets): | 1022 not test_compile_targets): |
1023 result.append(test) | 1023 result.append(test) |
1024 return result | 1024 return result |
OLD | NEW |