OLD | NEW |
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 from master import master_config | 5 from master import master_config |
6 from master.factory import chromium_factory | 6 from master.factory import chromium_factory |
7 | 7 |
8 defaults = {} | 8 defaults = {} |
9 | 9 |
10 helper = master_config.Helper(defaults) | 10 helper = master_config.Helper(defaults) |
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
96 'browser_total_shards': 3, 'browser_shard_index': 1,}) | 96 'browser_total_shards': 3, 'browser_shard_index': 1,}) |
97 ) | 97 ) |
98 | 98 |
99 B('Mac10.6 Tests (2)', 'rel_unit_2', 'testers', 'mac_rel_trigger', | 99 B('Mac10.6 Tests (2)', 'rel_unit_2', 'testers', 'mac_rel_trigger', |
100 notify_on_missing=True) | 100 notify_on_missing=True) |
101 F('rel_unit_2', mac_tester().ChromiumFactory( | 101 F('rel_unit_2', mac_tester().ChromiumFactory( |
102 slave_type='Tester', | 102 slave_type='Tester', |
103 build_url=rel_archive, | 103 build_url=rel_archive, |
104 tests=[ | 104 tests=[ |
105 'browser_tests', | 105 'browser_tests', |
| 106 'components_unittests', |
106 'unit', | 107 'unit', |
107 ], | 108 ], |
108 factory_properties={'generate_gtest_json': True, | 109 factory_properties={'generate_gtest_json': True, |
109 'sharded_tests': sharded_tests, | 110 'sharded_tests': sharded_tests, |
110 'browser_total_shards': 3, 'browser_shard_index': 2,}) | 111 'browser_total_shards': 3, 'browser_shard_index': 2,}) |
111 ) | 112 ) |
112 | 113 |
113 B('Mac10.6 Tests (3)', 'rel_unit_3', 'testers', 'mac_rel_trigger', | 114 B('Mac10.6 Tests (3)', 'rel_unit_3', 'testers', 'mac_rel_trigger', |
114 notify_on_missing=True) | 115 notify_on_missing=True) |
115 F('rel_unit_3', mac_tester().ChromiumFactory( | 116 F('rel_unit_3', mac_tester().ChromiumFactory( |
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
238 'browser_total_shards': 4, 'browser_shard_index': 3,})) | 239 'browser_total_shards': 4, 'browser_shard_index': 3,})) |
239 | 240 |
240 B('Mac 10.6 Tests (dbg)(4)', 'dbg_unit_4', 'testers', 'mac_dbg_trigger', | 241 B('Mac 10.6 Tests (dbg)(4)', 'dbg_unit_4', 'testers', 'mac_dbg_trigger', |
241 notify_on_missing=True) | 242 notify_on_missing=True) |
242 F('dbg_unit_4', mac_tester().ChromiumFactory( | 243 F('dbg_unit_4', mac_tester().ChromiumFactory( |
243 slave_type='Tester', | 244 slave_type='Tester', |
244 build_url=dbg_archive, | 245 build_url=dbg_archive, |
245 target='Debug', | 246 target='Debug', |
246 tests=[ | 247 tests=[ |
247 'browser_tests', | 248 'browser_tests', |
| 249 'components_unittests', |
248 'unit', | 250 'unit', |
249 ], | 251 ], |
250 factory_properties={'generate_gtest_json': True, | 252 factory_properties={'generate_gtest_json': True, |
251 'sharded_tests': sharded_tests, | 253 'sharded_tests': sharded_tests, |
252 'browser_total_shards': 4, 'browser_shard_index': 4,})) | 254 'browser_total_shards': 4, 'browser_shard_index': 4,})) |
253 | 255 |
254 B('Mac 10.7 Tests (dbg)(1)', 'dbg_unit_1', 'testers', 'mac_dbg_trigger', | 256 B('Mac 10.7 Tests (dbg)(1)', 'dbg_unit_1', 'testers', 'mac_dbg_trigger', |
255 notify_on_missing=True) | 257 notify_on_missing=True) |
256 B('Mac 10.7 Tests (dbg)(2)', 'dbg_unit_2', 'testers', 'mac_dbg_trigger', | 258 B('Mac 10.7 Tests (dbg)(2)', 'dbg_unit_2', 'testers', 'mac_dbg_trigger', |
257 notify_on_missing=True) | 259 notify_on_missing=True) |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
317 'test_platform': 'ios-simulator', | 319 'test_platform': 'ios-simulator', |
318 'gclient_deps': 'ios', | 320 'gclient_deps': 'ios', |
319 'gclient_env': { | 321 'gclient_env': { |
320 'GYP_DEFINES': 'component=static_library OS=ios chromium_ios_signing=0', | 322 'GYP_DEFINES': 'component=static_library OS=ios chromium_ios_signing=0', |
321 'GYP_GENERATOR_FLAGS': 'xcode_project_version=3.2', | 323 'GYP_GENERATOR_FLAGS': 'xcode_project_version=3.2', |
322 }, | 324 }, |
323 })) | 325 })) |
324 | 326 |
325 def Update(config, active_master, c): | 327 def Update(config, active_master, c): |
326 return helper.Update(c) | 328 return helper.Update(c) |
OLD | NEW |