OLD | NEW |
---|---|
1 # Copyright 2015 The Chromium Authors. All rights reserved. | 1 # Copyright 2015 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 from . import steps | 6 from . import steps |
7 | 7 |
8 | 8 |
9 _builders = collections.defaultdict(dict) | 9 _builders = collections.defaultdict(dict) |
10 | 10 |
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
83 spec = BaseSpec( | 83 spec = BaseSpec( |
84 bot_type='tester', | 84 bot_type='tester', |
85 chromium_apply_config=[], | 85 chromium_apply_config=[], |
86 gclient_config=gclient_config, | 86 gclient_config=gclient_config, |
87 platform=platform, | 87 platform=platform, |
88 target_bits=target_bits, | 88 target_bits=target_bits, |
89 build_config=build_config) | 89 build_config=build_config) |
90 | 90 |
91 spec['parent_buildername'] = parent_builder | 91 spec['parent_buildername'] = parent_builder |
92 | 92 |
93 spec['test_generators'] = [ | |
94 steps.generate_gtest, | |
ghost stip (do not use)
2016/09/22 23:25:50
kjellander: fyi, this shouldn't affect anything
| |
95 steps.generate_script, | |
96 steps.generate_isolated_script, | |
97 ] | |
98 | |
99 if platform == 'android': | 93 if platform == 'android': |
100 spec['root_devices'] = True | 94 spec['root_devices'] = True |
101 spec['tests'] = [ | 95 spec['tests'] = [ |
102 steps.GTestTest( | 96 steps.GTestTest( |
103 'content_browsertests', | 97 'content_browsertests', |
104 args=['--gtest_filter=WebRtc*']), | 98 args=['--gtest_filter=WebRtc*']), |
105 ] | 99 ] |
106 else: | 100 else: |
107 spec['gclient_apply_config'].append('webrtc_test_resources') | 101 spec['gclient_apply_config'].append('webrtc_test_resources') |
108 spec['tests'] = [ | 102 spec['tests'] = [ |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
147 | 141 |
148 AddBuildSpec('Win Builder', 'win', target_bits=32) | 142 AddBuildSpec('Win Builder', 'win', target_bits=32) |
149 AddBuildSpec('Mac Builder', 'mac') | 143 AddBuildSpec('Mac Builder', 'mac') |
150 AddBuildSpec('Linux Builder', 'linux') | 144 AddBuildSpec('Linux Builder', 'linux') |
151 | 145 |
152 AddTestSpec('Win7 Tester', 'chromium-webrtc-rel-7', 'win', target_bits=32) | 146 AddTestSpec('Win7 Tester', 'chromium-webrtc-rel-7', 'win', target_bits=32) |
153 AddTestSpec('Win8 Tester', 'chromium-webrtc-rel-win8', 'win', target_bits=32) | 147 AddTestSpec('Win8 Tester', 'chromium-webrtc-rel-win8', 'win', target_bits=32) |
154 AddTestSpec('Win10 Tester', 'chromium-webrtc-rel-win10', 'win', target_bits=32) | 148 AddTestSpec('Win10 Tester', 'chromium-webrtc-rel-win10', 'win', target_bits=32) |
155 AddTestSpec('Mac Tester', 'chromium-webrtc-rel-mac', 'mac') | 149 AddTestSpec('Mac Tester', 'chromium-webrtc-rel-mac', 'mac') |
156 AddTestSpec('Linux Tester', 'chromium-webrtc-rel-linux', 'linux') | 150 AddTestSpec('Linux Tester', 'chromium-webrtc-rel-linux', 'linux') |
OLD | NEW |