| 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 contextlib | 5 import contextlib |
| 6 import copy | 6 import copy |
| 7 import itertools | 7 import itertools |
| 8 import json | 8 import json |
| 9 | 9 |
| 10 from recipe_engine.types import freeze | 10 from recipe_engine.types import freeze |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 bot_config.get('GYP_DEFINES', {})) | 84 bot_config.get('GYP_DEFINES', {})) |
| 85 if bot_config.get('use_isolate'): | 85 if bot_config.get('use_isolate'): |
| 86 self.m.isolate.set_isolate_environment(self.m.chromium.c) | 86 self.m.isolate.set_isolate_environment(self.m.chromium.c) |
| 87 | 87 |
| 88 self.m.gclient.set_config( | 88 self.m.gclient.set_config( |
| 89 bot_config.get('gclient_config'), | 89 bot_config.get('gclient_config'), |
| 90 PATCH_PROJECT=self.m.properties.get('patch_project'), | 90 PATCH_PROJECT=self.m.properties.get('patch_project'), |
| 91 BUILDSPEC_VERSION=buildspec_version, | 91 BUILDSPEC_VERSION=buildspec_version, |
| 92 **bot_config.get('gclient_config_kwargs', {})) | 92 **bot_config.get('gclient_config_kwargs', {})) |
| 93 | 93 |
| 94 self.m.test_results.set_config( |
| 95 bot_config.get('test_results_config')) |
| 96 |
| 94 if bot_config.get('android_config'): | 97 if bot_config.get('android_config'): |
| 95 self.m.chromium_android.configure_from_properties( | 98 self.m.chromium_android.configure_from_properties( |
| 96 bot_config.get('android_config'), | 99 bot_config.get('android_config'), |
| 97 **bot_config.get('chromium_config_kwargs', {})) | 100 **bot_config.get('chromium_config_kwargs', {})) |
| 98 | 101 |
| 99 for c in bot_config.get('chromium_apply_config', []): | 102 for c in bot_config.get('chromium_apply_config', []): |
| 100 self.m.chromium.apply_config(c) | 103 self.m.chromium.apply_config(c) |
| 101 | 104 |
| 102 for c in bot_config.get('gclient_apply_config', []): | 105 for c in bot_config.get('gclient_apply_config', []): |
| 103 self.m.gclient.apply_config(c) | 106 self.m.gclient.apply_config(c) |
| (...skipping 674 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 778 | 781 |
| 779 if not tests: | 782 if not tests: |
| 780 return | 783 return |
| 781 | 784 |
| 782 api.chromium_swarming.configure_swarming( | 785 api.chromium_swarming.configure_swarming( |
| 783 'chromium', precommit=False, mastername=mastername) | 786 'chromium', precommit=False, mastername=mastername) |
| 784 test_runner = api.chromium_tests.create_test_runner( | 787 test_runner = api.chromium_tests.create_test_runner( |
| 785 api, tests, serialize_tests=bot_config.get('serialize_tests')) | 788 api, tests, serialize_tests=bot_config.get('serialize_tests')) |
| 786 with api.chromium_tests.wrap_chromium_tests(bot_config, tests): | 789 with api.chromium_tests.wrap_chromium_tests(bot_config, tests): |
| 787 test_runner() | 790 test_runner() |
| OLD | NEW |