| 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 13 matching lines...) Expand all Loading... |
| 24 | 24 |
| 25 S(name='chromium_local', branch='src', treeStableTimer=60) | 25 S(name='chromium_local', branch='src', treeStableTimer=60) |
| 26 | 26 |
| 27 T('chromiumos_rel_trigger') | 27 T('chromiumos_rel_trigger') |
| 28 | 28 |
| 29 # Tests that are single-machine shard-safe. For now we only use the sharding | 29 # Tests that are single-machine shard-safe. For now we only use the sharding |
| 30 # supervisor for long tests (more than 30 seconds) that are known to be stable. | 30 # supervisor for long tests (more than 30 seconds) that are known to be stable. |
| 31 sharded_tests = [ | 31 sharded_tests = [ |
| 32 'base_unittests', | 32 'base_unittests', |
| 33 'browser_tests', | 33 'browser_tests', |
| 34 'components_unittests', |
| 34 'content_browsertests', | 35 'content_browsertests', |
| 35 'content_unittests', | 36 'content_unittests', |
| 36 'media_unittests', | 37 'media_unittests', |
| 37 ] | 38 ] |
| 38 | 39 |
| 39 linux_chromeos_tests = [ | 40 linux_chromeos_tests = [ |
| 40 ('ash_unittests', 'aura_builder', 1), | 41 ('ash_unittests', 'aura_builder', 1), |
| 41 ('aura', 'aura_builder', 1), | 42 ('aura', 'aura_builder', 1), |
| 42 ('base', 'base_unittests', 1), | 43 ('base', 'base_unittests', 1), |
| 43 ('browser_tests', 'browser_tests', 2), | 44 ('browser_tests', 'browser_tests', 2), |
| 44 ('cacheinvalidation', 'cacheinvalidation_unittests', 1), | 45 ('cacheinvalidation', 'cacheinvalidation_unittests', 1), |
| 45 ('chromeos_unittests', 'chromeos_unittests', 1), | 46 ('chromeos_unittests', 'chromeos_unittests', 1), |
| 47 ('components_unittests', 'components_unittests', 1), |
| 46 ('compositor', 'compositor_unittests', 1), | 48 ('compositor', 'compositor_unittests', 1), |
| 47 ('content_browsertests', 'content_browsertests', 2), | 49 ('content_browsertests', 'content_browsertests', 2), |
| 48 ('content_unittests', 'content_unittests', 1), | 50 ('content_unittests', 'content_unittests', 1), |
| 49 ('crypto', 'crypto_unittests', 1), | 51 ('crypto', 'crypto_unittests', 1), |
| 50 ('dbus', 'dbus_unittests', 1), | 52 ('dbus', 'dbus_unittests', 1), |
| 51 ('device_unittests', 'device_unittests', 1), | 53 ('device_unittests', 'device_unittests', 1), |
| 52 ('googleurl', 'googleurl_unittests', 1), | 54 ('googleurl', 'googleurl_unittests', 1), |
| 53 (None, 'googleurl_unittests', 1), | 55 (None, 'googleurl_unittests', 1), |
| 54 ('gpu', 'gpu_unittests', 1), | 56 ('gpu', 'gpu_unittests', 1), |
| 55 ('interactive_ui', 'interactive_ui_tests', 3), | 57 ('interactive_ui', 'interactive_ui_tests', 3), |
| (...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 232 target='Debug', | 234 target='Debug', |
| 233 tests=extract_tests(linux_chromeos_tests, 3), | 235 tests=extract_tests(linux_chromeos_tests, 3), |
| 234 factory_properties={'chromeos': 1, | 236 factory_properties={'chromeos': 1, |
| 235 'sharded_tests': sharded_tests, | 237 'sharded_tests': sharded_tests, |
| 236 'generate_gtest_json': True,})) | 238 'generate_gtest_json': True,})) |
| 237 | 239 |
| 238 | 240 |
| 239 | 241 |
| 240 def Update(config, active_master, c): | 242 def Update(config, active_master, c): |
| 241 return helper.Update(c) | 243 return helper.Update(c) |
| OLD | NEW |