| 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 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 # not support that. | 120 # not support that. |
| 121 self.m.chromium.c.gyp_env.GYP_DEFINES.update( | 121 self.m.chromium.c.gyp_env.GYP_DEFINES.update( |
| 122 bot_config.get('GYP_DEFINES', {})) | 122 bot_config.get('GYP_DEFINES', {})) |
| 123 if bot_config.get('use_isolate'): | 123 if bot_config.get('use_isolate'): |
| 124 self.m.isolate.set_isolate_environment(self.m.chromium.c) | 124 self.m.isolate.set_isolate_environment(self.m.chromium.c) |
| 125 | 125 |
| 126 self.m.gclient.set_config( | 126 self.m.gclient.set_config( |
| 127 bot_config.get('gclient_config'), | 127 bot_config.get('gclient_config'), |
| 128 PATCH_PROJECT=self.m.properties.get('patch_project'), | 128 PATCH_PROJECT=self.m.properties.get('patch_project'), |
| 129 BUILDSPEC_VERSION=buildspec_version, | 129 BUILDSPEC_VERSION=buildspec_version, |
| 130 GIT_MODE=True, |
| 130 **bot_config.get('gclient_config_kwargs', {})) | 131 **bot_config.get('gclient_config_kwargs', {})) |
| 131 | 132 |
| 132 self.m.test_results.set_config( | 133 self.m.test_results.set_config( |
| 133 bot_config.get('test_results_config')) | 134 bot_config.get('test_results_config')) |
| 134 | 135 |
| 135 if bot_config.get('android_config'): | 136 if bot_config.get('android_config'): |
| 136 self.m.chromium_android.configure_from_properties( | 137 self.m.chromium_android.configure_from_properties( |
| 137 bot_config.get('android_config'), | 138 bot_config.get('android_config'), |
| 138 **bot_config.get('chromium_config_kwargs', {})) | 139 **bot_config.get('chromium_config_kwargs', {})) |
| 139 | 140 |
| (...skipping 867 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1007 targets in |compile_targets|.""" | 1008 targets in |compile_targets|.""" |
| 1008 result = [] | 1009 result = [] |
| 1009 for test in tests: | 1010 for test in tests: |
| 1010 test_compile_targets = test.compile_targets(api) | 1011 test_compile_targets = test.compile_targets(api) |
| 1011 # Always return tests that don't require compile. Otherwise we'd never | 1012 # Always return tests that don't require compile. Otherwise we'd never |
| 1012 # run them. | 1013 # run them. |
| 1013 if ((set(compile_targets) & set(test_compile_targets)) or | 1014 if ((set(compile_targets) & set(test_compile_targets)) or |
| 1014 not test_compile_targets): | 1015 not test_compile_targets): |
| 1015 result.append(test) | 1016 result.append(test) |
| 1016 return result | 1017 return result |
| OLD | NEW |