| 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 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 88 bot_config.get('GYP_DEFINES', {})) | 88 bot_config.get('GYP_DEFINES', {})) |
| 89 if bot_config.get('use_isolate'): | 89 if bot_config.get('use_isolate'): |
| 90 self.m.isolate.set_isolate_environment(self.m.chromium.c) | 90 self.m.isolate.set_isolate_environment(self.m.chromium.c) |
| 91 | 91 |
| 92 self.m.gclient.set_config( | 92 self.m.gclient.set_config( |
| 93 bot_config.get('gclient_config'), | 93 bot_config.get('gclient_config'), |
| 94 PATCH_PROJECT=self.m.properties.get('patch_project'), | 94 PATCH_PROJECT=self.m.properties.get('patch_project'), |
| 95 BUILDSPEC_VERSION=buildspec_version, | 95 BUILDSPEC_VERSION=buildspec_version, |
| 96 **bot_config.get('gclient_config_kwargs', {})) | 96 **bot_config.get('gclient_config_kwargs', {})) |
| 97 | 97 |
| 98 self.m.test_results.set_config( |
| 99 bot_config.get('test_results_config')) |
| 100 |
| 98 if bot_config.get('android_config'): | 101 if bot_config.get('android_config'): |
| 99 self.m.chromium_android.configure_from_properties( | 102 self.m.chromium_android.configure_from_properties( |
| 100 bot_config.get('android_config'), | 103 bot_config.get('android_config'), |
| 101 **bot_config.get('chromium_config_kwargs', {})) | 104 **bot_config.get('chromium_config_kwargs', {})) |
| 102 | 105 |
| 103 for c in bot_config.get('chromium_apply_config', []): | 106 for c in bot_config.get('chromium_apply_config', []): |
| 104 self.m.chromium.apply_config(c) | 107 self.m.chromium.apply_config(c) |
| 105 | 108 |
| 106 for c in bot_config.get('gclient_apply_config', []): | 109 for c in bot_config.get('gclient_apply_config', []): |
| 107 self.m.gclient.apply_config(c) | 110 self.m.gclient.apply_config(c) |
| (...skipping 710 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 818 | 821 |
| 819 if not tests: | 822 if not tests: |
| 820 return | 823 return |
| 821 | 824 |
| 822 api.chromium_swarming.configure_swarming( | 825 api.chromium_swarming.configure_swarming( |
| 823 'chromium', precommit=False, mastername=mastername) | 826 'chromium', precommit=False, mastername=mastername) |
| 824 test_runner = api.chromium_tests.create_test_runner( | 827 test_runner = api.chromium_tests.create_test_runner( |
| 825 api, tests, serialize_tests=bot_config.get('serialize_tests')) | 828 api, tests, serialize_tests=bot_config.get('serialize_tests')) |
| 826 with api.chromium_tests.wrap_chromium_tests(bot_config, tests): | 829 with api.chromium_tests.wrap_chromium_tests(bot_config, tests): |
| 827 test_runner() | 830 test_runner() |
| OLD | NEW |