| 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 18 matching lines...) Expand all Loading... |
| 29 T('mac_asan_64_rel_trigger') | 29 T('mac_asan_64_rel_trigger') |
| 30 | 30 |
| 31 # Tests that are single-machine shard-safe. | 31 # Tests that are single-machine shard-safe. |
| 32 sharded_tests = [ | 32 sharded_tests = [ |
| 33 'aura_unittests', | 33 'aura_unittests', |
| 34 'base_unittests', | 34 'base_unittests', |
| 35 'browser_tests', | 35 'browser_tests', |
| 36 'cacheinvalidation_unittests', | 36 'cacheinvalidation_unittests', |
| 37 'cc_unittests', | 37 'cc_unittests', |
| 38 'chromedriver_tests', | 38 'chromedriver_tests', |
| 39 'chromedriver_unittests', |
| 39 'chromedriver2_unittests', | 40 'chromedriver2_unittests', |
| 40 'components_unittests', | 41 'components_unittests', |
| 41 'content_browsertests', | 42 'content_browsertests', |
| 42 'content_unittests', | 43 'content_unittests', |
| 43 'crypto_unittests', | 44 'crypto_unittests', |
| 44 'device_unittests', | 45 'device_unittests', |
| 45 'gpu_unittests', | 46 'gpu_unittests', |
| 46 'jingle_unittests', | 47 'jingle_unittests', |
| 47 'media_unittests', | 48 'media_unittests', |
| 48 'net_unittests', | 49 'net_unittests', |
| 49 'ppapi_unittests', | 50 'ppapi_unittests', |
| 50 'printing_unittests', | 51 'printing_unittests', |
| 51 'remoting_unittests', | 52 'remoting_unittests', |
| 52 'sync_integration_tests', | 53 'sync_integration_tests', |
| 53 'sync_unit_tests', | 54 'sync_unit_tests', |
| 54 'ui_unittests', | 55 'ui_unittests', |
| 55 'unit_tests', | 56 'unit_tests', |
| 56 'views_unittests', | 57 'views_unittests', |
| 57 'webkit_compositor_bindings_unittests', | 58 'webkit_compositor_bindings_unittests', |
| 58 ] | 59 ] |
| 59 | 60 |
| 60 mac_asan_options = [ | 61 mac_asan_options = [ |
| 61 'base_unittests', | 62 'base_unittests', |
| 62 'browser_tests', | 63 'browser_tests', |
| 63 'cacheinvalidation_unittests', | 64 'cacheinvalidation_unittests', |
| 64 'cc_unittests', | 65 'cc_unittests', |
| 66 'chromedriver_unittests', |
| 65 'chromedriver2_unittests', | 67 'chromedriver2_unittests', |
| 66 'components_unittests', | 68 'components_unittests', |
| 67 'content_browsertests', | 69 'content_browsertests', |
| 68 'content_unittests', | 70 'content_unittests', |
| 69 'crypto_unittests', | 71 'crypto_unittests', |
| 70 'device_unittests', | 72 'device_unittests', |
| 71 'gpu_unittests', | 73 'gpu_unittests', |
| 72 'interactive_ui_tests', | 74 'interactive_ui_tests', |
| 73 'ipc_tests', | 75 'ipc_tests', |
| 74 'jingle_unittests', | 76 'jingle_unittests', |
| (...skipping 12 matching lines...) Expand all Loading... |
| 87 ] | 89 ] |
| 88 | 90 |
| 89 # See above. It's ok to run unit_tests under ASan on 64-bit OSX. | 91 # See above. It's ok to run unit_tests under ASan on 64-bit OSX. |
| 90 mac_asan_64_options = mac_asan_options + ['unit_tests'] | 92 mac_asan_64_options = mac_asan_options + ['unit_tests'] |
| 91 | 93 |
| 92 mac_asan_tests_1 = [ | 94 mac_asan_tests_1 = [ |
| 93 'base_unittests', | 95 'base_unittests', |
| 94 'browser_tests', | 96 'browser_tests', |
| 95 'cacheinvalidation_unittests', | 97 'cacheinvalidation_unittests', |
| 96 'cc_unittests', | 98 'cc_unittests', |
| 99 'chromedriver_unittests', |
| 97 'chromedriver2_unittests', | 100 'chromedriver2_unittests', |
| 98 'components_unittests', | 101 'components_unittests', |
| 99 'content_browsertests', | 102 'content_browsertests', |
| 100 'content_unittests', | 103 'content_unittests', |
| 101 'crypto_unittests', | 104 'crypto_unittests', |
| 102 'googleurl', | 105 'googleurl', |
| 103 'gpu_unittests', | 106 'gpu_unittests', |
| 104 'ipc_tests', | 107 'ipc_tests', |
| 105 'jingle', | 108 'jingle', |
| 106 'media', | 109 'media', |
| (...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 275 factory_properties={ | 278 factory_properties={ |
| 276 'asan': True, | 279 'asan': True, |
| 277 'browser_shard_index': '3', | 280 'browser_shard_index': '3', |
| 278 'browser_total_shards': '3', | 281 'browser_total_shards': '3', |
| 279 'gclient_env': gclient_64_env, | 282 'gclient_env': gclient_64_env, |
| 280 'sharded_tests': sharded_tests, | 283 'sharded_tests': sharded_tests, |
| 281 })) | 284 })) |
| 282 | 285 |
| 283 def Update(config, active_master, c): | 286 def Update(config, active_master, c): |
| 284 return helper.Update(c) | 287 return helper.Update(c) |
| OLD | NEW |