| OLD | NEW |
| 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 factory_properties={'trigger': 'linux_rel_trigger'})) | 66 factory_properties={'trigger': 'linux_rel_trigger'})) |
| 67 | 67 |
| 68 # | 68 # |
| 69 # Linux Rel testers | 69 # Linux Rel testers |
| 70 # | 70 # |
| 71 B('Linux Tests x64', 'rel_unit', 'testers', 'linux_rel_trigger', | 71 B('Linux Tests x64', 'rel_unit', 'testers', 'linux_rel_trigger', |
| 72 auto_reboot=True, notify_on_missing=True) | 72 auto_reboot=True, notify_on_missing=True) |
| 73 F('rel_unit', linux().ChromiumFactory( | 73 F('rel_unit', linux().ChromiumFactory( |
| 74 slave_type='NASTester', | 74 slave_type='NASTester', |
| 75 tests=['check_deps', | 75 tests=['check_deps', |
| 76 'check_licenses', |
| 76 'googleurl', | 77 'googleurl', |
| 77 'media', | 78 'media', |
| 78 'printing', | 79 'printing', |
| 79 'remoting', | 80 'remoting', |
| 80 'ui', | 81 'ui', |
| 81 'browser_tests', | 82 'browser_tests', |
| 82 'unit', | 83 'unit', |
| 83 'gpu', | 84 'gpu', |
| 84 'base', | 85 'base', |
| 85 'net', | 86 'net', |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 156 | 157 |
| 157 # | 158 # |
| 158 # Linux Dbg Unit testers | 159 # Linux Dbg Unit testers |
| 159 # | 160 # |
| 160 | 161 |
| 161 B('Linux Tests (dbg)(1)', 'dbg_unit_1', 'testers', 'linux_dbg_trigger', | 162 B('Linux Tests (dbg)(1)', 'dbg_unit_1', 'testers', 'linux_dbg_trigger', |
| 162 auto_reboot=True, notify_on_missing=True) | 163 auto_reboot=True, notify_on_missing=True) |
| 163 F('dbg_unit_1', linux().ChromiumFactory( | 164 F('dbg_unit_1', linux().ChromiumFactory( |
| 164 slave_type='NASTester', | 165 slave_type='NASTester', |
| 165 target='Debug', | 166 target='Debug', |
| 166 tests=['check_deps', 'net', 'browser_tests'], | 167 tests=['check_deps', 'check_licenses', 'net', 'browser_tests'], |
| 167 factory_properties={'generate_gtest_json': True})) | 168 factory_properties={'generate_gtest_json': True})) |
| 168 | 169 |
| 169 B('Linux Tests (dbg)(2)', 'dbg_unit_2', 'testers', 'linux_dbg_trigger', | 170 B('Linux Tests (dbg)(2)', 'dbg_unit_2', 'testers', 'linux_dbg_trigger', |
| 170 auto_reboot=True, notify_on_missing=True) | 171 auto_reboot=True, notify_on_missing=True) |
| 171 F('dbg_unit_2', linux().ChromiumFactory( | 172 F('dbg_unit_2', linux().ChromiumFactory( |
| 172 slave_type='NASTester', | 173 slave_type='NASTester', |
| 173 target='Debug', | 174 target='Debug', |
| 174 tests=['unit', | 175 tests=['unit', |
| 175 'nacl_integration', | 176 'nacl_integration', |
| 176 'gpu', | 177 'gpu', |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 235 options=['--build-tool=make', '--compiler=clang'], | 236 options=['--build-tool=make', '--compiler=clang'], |
| 236 tests=['base', 'gfx', 'unit', 'crypto'], | 237 tests=['base', 'gfx', 'unit', 'crypto'], |
| 237 factory_properties={ | 238 factory_properties={ |
| 238 'gclient_env': { | 239 'gclient_env': { |
| 239 'GYP_DEFINES':'clang=1 clang_use_chrome_plugins=1 fastbuild=1' | 240 'GYP_DEFINES':'clang=1 clang_use_chrome_plugins=1 fastbuild=1' |
| 240 }})) | 241 }})) |
| 241 | 242 |
| 242 | 243 |
| 243 def Update(config, active_master, c): | 244 def Update(config, active_master, c): |
| 244 return helper.Update(c) | 245 return helper.Update(c) |
| OLD | NEW |