| 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 24 matching lines...) Expand all Loading... |
| 35 tests_1 = [ | 35 tests_1 = [ |
| 36 'base_unittests', | 36 'base_unittests', |
| 37 'browser_tests', | 37 'browser_tests', |
| 38 'cacheinvalidation_unittests', | 38 'cacheinvalidation_unittests', |
| 39 'crypto_unittests', | 39 'crypto_unittests', |
| 40 'gpu_unittests', | 40 'gpu_unittests', |
| 41 'jingle_unittests', | 41 'jingle_unittests', |
| 42 'net_unittests', | 42 'net_unittests', |
| 43 'sql_unittests', | 43 'sql_unittests', |
| 44 'ui_unittests', | 44 'ui_unittests', |
| 45 'components_unittests', |
| 45 'content_unittests', | 46 'content_unittests', |
| 46 # Bug in ASAN causes this to time out. Disabling until ASAN can handle it. | 47 # Bug in ASAN causes this to time out. Disabling until ASAN can handle it. |
| 47 #'views_unittests', | 48 #'views_unittests', |
| 48 ] | 49 ] |
| 49 | 50 |
| 50 tests_2 = [ | 51 tests_2 = [ |
| 51 'browser_tests', | 52 'browser_tests', |
| 52 'content_browsertests', | 53 'content_browsertests', |
| 53 'googleurl_unittests', | 54 'googleurl_unittests', |
| 54 'media_unittests', | 55 'media_unittests', |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 'browser_shard_index': 2, | 115 'browser_shard_index': 2, |
| 115 'browser_total_shards': 2, | 116 'browser_total_shards': 2, |
| 116 'testing_env': { | 117 'testing_env': { |
| 117 'CHROME_ALLOCATOR': 'WINHEAP', | 118 'CHROME_ALLOCATOR': 'WINHEAP', |
| 118 }, | 119 }, |
| 119 })) | 120 })) |
| 120 | 121 |
| 121 | 122 |
| 122 def Update(config, active_master, c): | 123 def Update(config, active_master, c): |
| 123 return helper.Update(c) | 124 return helper.Update(c) |
| OLD | NEW |