| OLD | NEW |
| 1 # Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2010 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) |
| 11 B = helper.Builder | 11 B = helper.Builder |
| 12 D = helper.Dependent | 12 D = helper.Dependent |
| 13 F = helper.Factory | 13 F = helper.Factory |
| 14 S = helper.Scheduler | 14 S = helper.Scheduler |
| 15 T = helper.Triggerable |
| 15 | 16 |
| 16 def chromeos(): return chromium_factory.ChromiumFactory('src/build', 'linux2') | 17 def chromeos(): return chromium_factory.ChromiumFactory('src/build', 'linux2') |
| 17 | 18 |
| 18 | 19 |
| 19 ################################################################################ | 20 ################################################################################ |
| 20 ## Release | 21 ## Release |
| 21 ################################################################################ | 22 ################################################################################ |
| 22 | 23 |
| 23 defaults['category'] = '8chromiumos' | 24 defaults['category'] = '8chromiumos' |
| 24 | 25 |
| (...skipping 20 matching lines...) Expand all Loading... |
| 45 ################################################################################ | 46 ################################################################################ |
| 46 ## Debug | 47 ## Debug |
| 47 ################################################################################ | 48 ################################################################################ |
| 48 | 49 |
| 49 # | 50 # |
| 50 # Main debug scheduler for src/ | 51 # Main debug scheduler for src/ |
| 51 # | 52 # |
| 52 S('chromeos_dbg', branch='src', treeStableTimer=60) | 53 S('chromeos_dbg', branch='src', treeStableTimer=60) |
| 53 | 54 |
| 54 # | 55 # |
| 55 # ChromeOS Dbg Builder | 56 # Triggerable scheduler for the builders |
| 57 # |
| 58 T('linux_cros_dbg_trigger') |
| 59 T('linux_views_dbg_trigger') |
| 60 |
| 61 # |
| 62 # ChromeOS Dbg Builders and Testers |
| 56 # | 63 # |
| 57 B('Linux Builder (ChromiumOS dbg)', 'cros_dbg', 'compile', 'chromeos_dbg') | 64 B('Linux Builder (ChromiumOS dbg)', 'cros_dbg', 'compile', 'chromeos_dbg') |
| 58 F('cros_dbg', chromeos().ChromiumOSFactory( | 65 F('cros_dbg', chromeos().ChromiumOSFactory( |
| 66 slave_type='NASBuilder', |
| 67 target='Debug', |
| 68 options=['--compiler=goma', 'chromeos_builder'], |
| 69 factory_properties={ |
| 70 'gclient_env': { 'GYP_DEFINES':'chromeos=1'}, |
| 71 'trigger': 'linux_cros_dbg_trigger'})) |
| 72 |
| 73 B('Linux Tester (ChromiumOS dbg)', 'cros_dbg_tests', 'testers', |
| 74 'linux_cros_dbg_trigger') |
| 75 F('cros_dbg_tests', chromeos().ChromiumOSFactory( |
| 76 slave_type='NASTester', |
| 59 target='Debug', | 77 target='Debug', |
| 60 tests=['unit', 'base', 'net', 'googleurl', 'media', 'ui', 'printing', | 78 tests=['unit', 'base', 'net', 'googleurl', 'media', 'ui', 'printing', |
| 61 'remoting', 'browser_tests', 'interactive_ui', 'views', 'crypto'], | 79 'remoting', 'browser_tests', 'interactive_ui', 'views', 'crypto'], |
| 62 options=['--compiler=goma', 'chromeos_builder'], | 80 factory_properties={'generate_gtest_json': True})) |
| 63 factory_properties={ | |
| 64 'gclient_env': { 'GYP_DEFINES':'chromeos=1'}, | |
| 65 'generate_gtest_json': True})) | |
| 66 | 81 |
| 67 B('Linux Builder (Views dbg)', 'view_dbg', 'compile', 'chromeos_dbg') | 82 B('Linux Builder (Views dbg)', 'view_dbg', 'compile', 'chromeos_dbg') |
| 68 F('view_dbg', chromeos().ChromiumOSFactory( | 83 F('view_dbg', chromeos().ChromiumOSFactory( |
| 84 slave_type='NASBuilder', |
| 69 target='Debug', | 85 target='Debug', |
| 70 tests=['unit', 'base', 'net', 'googleurl', 'media', 'ui', 'printing', | |
| 71 'remoting', 'browser_tests', 'interactive_ui', 'views', 'crypto'], | |
| 72 options=['--compiler=goma', 'app_unittests', 'base_unittests', | 86 options=['--compiler=goma', 'app_unittests', 'base_unittests', |
| 73 'browser_tests', 'interactive_ui_tests', 'ipc_tests', | 87 'browser_tests', 'interactive_ui_tests', 'ipc_tests', |
| 74 'googleurl_unittests', 'media_unittests', 'net_unittests', | 88 'googleurl_unittests', 'media_unittests', 'net_unittests', |
| 75 'printing_unittests', 'remoting_unittests', 'sync_unit_tests', | 89 'printing_unittests', 'remoting_unittests', 'sync_unit_tests', |
| 76 'ui_tests', 'unit_tests', 'views_unittests', 'gfx_unittests', | 90 'ui_tests', 'unit_tests', 'views_unittests', 'gfx_unittests', |
| 77 'crypto_unittests'], | 91 'crypto_unittests'], |
| 78 factory_properties={'gclient_env': { 'GYP_DEFINES':'toolkit_views=1'}, | 92 factory_properties={'gclient_env': { 'GYP_DEFINES':'toolkit_views=1'}, |
| 79 'generate_gtest_json': True})) | 93 'trigger': 'linux_views_dbg_trigger'})) |
| 94 |
| 95 B('Linux Tester (Views dbg)', 'view_dbg_tests', 'testers', |
| 96 'linux_views_dbg_trigger') |
| 97 F('view_dbg_tests', chromeos().ChromiumOSFactory( |
| 98 slave_type='NASTester', |
| 99 target='Debug', |
| 100 tests=['unit', 'base', 'net', 'googleurl', 'media', 'ui', 'printing', |
| 101 'remoting', 'browser_tests', 'interactive_ui', 'views', 'crypto'], |
| 102 factory_properties={'generate_gtest_json': True})) |
| 80 | 103 |
| 81 | 104 |
| 82 crosstool_prefix = ( | 105 crosstool_prefix = ( |
| 83 '/usr/local/crosstool-trusted/arm-2009q3/bin/arm-none-linux-gnueabi') | 106 '/usr/local/crosstool-trusted/arm-2009q3/bin/arm-none-linux-gnueabi') |
| 84 # Factory properties to use for an arm build. | 107 # Factory properties to use for an arm build. |
| 85 arm_gclient_env = { | 108 arm_gclient_env = { |
| 86 'AR': crosstool_prefix + '-ar', | 109 'AR': crosstool_prefix + '-ar', |
| 87 'AS': crosstool_prefix + '-as', | 110 'AS': crosstool_prefix + '-as', |
| 88 'CC': crosstool_prefix + '-gcc', | 111 'CC': crosstool_prefix + '-gcc', |
| 89 'CXX': crosstool_prefix + '-g++', | 112 'CXX': crosstool_prefix + '-g++', |
| (...skipping 24 matching lines...) Expand all Loading... |
| 114 compile_timeout=14400, | 137 compile_timeout=14400, |
| 115 options=[ | 138 options=[ |
| 116 '--build-tool=make', | 139 '--build-tool=make', |
| 117 '--crosstool=' + crosstool_prefix, | 140 '--crosstool=' + crosstool_prefix, |
| 118 'chromeos_builder', | 141 'chromeos_builder', |
| 119 ], | 142 ], |
| 120 factory_properties=arm_dbg_factory_properties)) | 143 factory_properties=arm_dbg_factory_properties)) |
| 121 | 144 |
| 122 def Update(config, active_master, c): | 145 def Update(config, active_master, c): |
| 123 return helper.Update(c) | 146 return helper.Update(c) |
| OLD | NEW |