| 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 22 matching lines...) Expand all Loading... |
| 33 'browser_tests', | 33 'browser_tests', |
| 34 'cacheinvalidation_unittests', | 34 'cacheinvalidation_unittests', |
| 35 'cc_unittests', | 35 'cc_unittests', |
| 36 'chromedriver_tests', | 36 'chromedriver_tests', |
| 37 'chromedriver2_unittests', | 37 'chromedriver2_unittests', |
| 38 'components_unittests', | 38 'components_unittests', |
| 39 'content_browsertests', | 39 'content_browsertests', |
| 40 'content_unittests', | 40 'content_unittests', |
| 41 'crypto_unittests', | 41 'crypto_unittests', |
| 42 'device_unittests', | 42 'device_unittests', |
| 43 'events_unittests', |
| 43 'gpu_unittests', | 44 'gpu_unittests', |
| 44 'jingle_unittests', | 45 'jingle_unittests', |
| 45 'media_unittests', | 46 'media_unittests', |
| 46 'net_unittests', | 47 'net_unittests', |
| 47 'ppapi_unittests', | 48 'ppapi_unittests', |
| 48 'printing_unittests', | 49 'printing_unittests', |
| 49 'remoting_unittests', | 50 'remoting_unittests', |
| 50 'sync_integration_tests', | 51 'sync_integration_tests', |
| 51 'sync_unit_tests', | 52 'sync_unit_tests', |
| 52 'ui_unittests', | 53 'ui_unittests', |
| (...skipping 10 matching lines...) Expand all Loading... |
| 63 ('browser_tests', 'browser_tests', 2), | 64 ('browser_tests', 'browser_tests', 2), |
| 64 ('cacheinvalidation_unittests', 'cacheinvalidation_unittests', 1), | 65 ('cacheinvalidation_unittests', 'cacheinvalidation_unittests', 1), |
| 65 ('chromeos_unittests', 'chromeos_unittests', 1), | 66 ('chromeos_unittests', 'chromeos_unittests', 1), |
| 66 ('components_unittests', 'components_unittests', 1), | 67 ('components_unittests', 'components_unittests', 1), |
| 67 ('compositor', 'compositor_unittests', 1), | 68 ('compositor', 'compositor_unittests', 1), |
| 68 ('content_browsertests', 'content_browsertests', 2), | 69 ('content_browsertests', 'content_browsertests', 2), |
| 69 ('content_unittests', 'content_unittests', 1), | 70 ('content_unittests', 'content_unittests', 1), |
| 70 ('crypto_unittests', 'crypto_unittests', 1), | 71 ('crypto_unittests', 'crypto_unittests', 1), |
| 71 ('dbus', 'dbus_unittests', 1), | 72 ('dbus', 'dbus_unittests', 1), |
| 72 ('device_unittests', 'device_unittests', 1), | 73 ('device_unittests', 'device_unittests', 1), |
| 74 ('events', 'aura_builder', 1), |
| 73 ('gpu', 'gpu_unittests', 1), | 75 ('gpu', 'gpu_unittests', 1), |
| 74 ('googleurl', 'url_unittests', 1), | 76 ('googleurl', 'url_unittests', 1), |
| 75 (None, 'url_unittests', 1), | 77 (None, 'url_unittests', 1), |
| 76 ('interactive_ui_tests', 'interactive_ui_tests', 3), | 78 ('interactive_ui_tests', 'interactive_ui_tests', 3), |
| 77 ('ipc_tests', 'ipc_tests', 1), | 79 ('ipc_tests', 'ipc_tests', 1), |
| 78 ('jingle', 'jingle_unittests', 1), | 80 ('jingle', 'jingle_unittests', 1), |
| 79 ('media', 'media_unittests', 1), | 81 ('media', 'media_unittests', 1), |
| 80 ('message_center_unittests', 'message_center_unittests', 1), | 82 ('message_center_unittests', 'message_center_unittests', 1), |
| 81 ('net', 'net_unittests', 1), | 83 ('net', 'net_unittests', 1), |
| 82 ('ppapi_unittests', 'ppapi_unittests', 1), | 84 ('ppapi_unittests', 'ppapi_unittests', 1), |
| (...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 256 target='Debug', | 258 target='Debug', |
| 257 tests=extract_tests(linux_chromeos_tests, 3), | 259 tests=extract_tests(linux_chromeos_tests, 3), |
| 258 factory_properties={'chromeos': 1, | 260 factory_properties={'chromeos': 1, |
| 259 'sharded_tests': sharded_tests, | 261 'sharded_tests': sharded_tests, |
| 260 'generate_gtest_json': True,})) | 262 'generate_gtest_json': True,})) |
| 261 | 263 |
| 262 | 264 |
| 263 | 265 |
| 264 def Update(config, active_master, c): | 266 def Update(config, active_master, c): |
| 265 return helper.Update(c) | 267 return helper.Update(c) |
| OLD | NEW |