| 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 14 matching lines...) Expand all Loading... |
| 25 | 25 |
| 26 ################################################################################ | 26 ################################################################################ |
| 27 ## Windows | 27 ## Windows |
| 28 ################################################################################ | 28 ################################################################################ |
| 29 | 29 |
| 30 B('Win', 'win_clobber', 'compile|windows', 'chromium', notify_on_missing=True) | 30 B('Win', 'win_clobber', 'compile|windows', 'chromium', notify_on_missing=True) |
| 31 F('win_clobber', win().ChromiumFactory( | 31 F('win_clobber', win().ChromiumFactory( |
| 32 clobber=True, | 32 clobber=True, |
| 33 project='all.sln', | 33 project='all.sln', |
| 34 tests=['check_deps2git', 'sizes', 'check_bins'], | 34 tests=['check_deps2git', 'sizes', 'check_bins'], |
| 35 factory_properties={'archive_build': True, | 35 factory_properties={ |
| 36 'gs_bucket': 'gs://chromium-browser-snapshots', | 36 'archive_build': True, |
| 37 'gs_acl': 'public-read', | 37 'gs_bucket': 'gs://chromium-browser-snapshots', |
| 38 'show_perf_results': True, | 38 'gs_acl': 'public-read', |
| 39 'perf_id': 'chromium-rel-xp', | 39 'show_perf_results': True, |
| 40 'expectations': True, | 40 'perf_id': 'chromium-rel-xp', |
| 41 'process_dumps': True, | 41 'expectations': True, |
| 42 'start_crash_handler': True, | 42 'process_dumps': True, |
| 43 'generate_gtest_json': True})) | 43 'start_crash_handler': True, |
| 44 'generate_gtest_json': True, |
| 45 'gclient_env': { |
| 46 'GYP_DEFINES': 'tests_run=noop', |
| 47 }, |
| 48 })) |
| 44 | 49 |
| 45 ################################################################################ | 50 ################################################################################ |
| 46 ## Mac | 51 ## Mac |
| 47 ################################################################################ | 52 ################################################################################ |
| 48 | 53 |
| 49 B('Mac', 'mac_clobber', 'compile|testers', 'chromium', notify_on_missing=True) | 54 B('Mac', 'mac_clobber', 'compile|testers', 'chromium', notify_on_missing=True) |
| 50 F('mac_clobber', mac().ChromiumFactory( | 55 F('mac_clobber', mac().ChromiumFactory( |
| 51 clobber=True, | 56 clobber=True, |
| 52 tests=['check_deps2git', 'sizes'], | 57 tests=['check_deps2git', 'sizes'], |
| 53 options=['--compiler=goma-clang'], | 58 options=['--compiler=goma-clang'], |
| 54 factory_properties={'archive_build': True, | 59 factory_properties={ |
| 55 'gs_bucket': 'gs://chromium-browser-snapshots', | 60 'archive_build': True, |
| 56 'gs_acl': 'public-read', | 61 'gs_bucket': 'gs://chromium-browser-snapshots', |
| 57 'show_perf_results': True, | 62 'gs_acl': 'public-read', |
| 58 'perf_id': 'chromium-rel-mac', | 63 'show_perf_results': True, |
| 59 'expectations': True, | 64 'perf_id': 'chromium-rel-mac', |
| 60 'generate_gtest_json': True})) | 65 'expectations': True, |
| 66 'generate_gtest_json': True, |
| 67 'gclient_env': { |
| 68 'GYP_DEFINES': 'tests_run=noop', |
| 69 }, |
| 70 })) |
| 61 | 71 |
| 62 ################################################################################ | 72 ################################################################################ |
| 63 ## Linux | 73 ## Linux |
| 64 ################################################################################ | 74 ################################################################################ |
| 65 | 75 |
| 66 # For now we will assume a fixed toolchain location on the builders. | |
| 67 crosstool_prefix = ( | |
| 68 '/usr/local/crosstool-trusted/arm-crosstool/bin/arm-none-linux-gnueabi') | |
| 69 # Factory properties to use for an arm build. | |
| 70 arm_gclient_env = { | |
| 71 'AR': crosstool_prefix + '-ar', | |
| 72 'AS': crosstool_prefix + '-as', | |
| 73 'CC': crosstool_prefix + '-gcc', | |
| 74 'CXX': crosstool_prefix + '-g++', | |
| 75 'LD': crosstool_prefix + '-ld', | |
| 76 'RANLIB': crosstool_prefix + '-ranlib', | |
| 77 'GYP_GENERATORS': 'make', | |
| 78 'GYP_DEFINES': ( | |
| 79 'target_arch=arm ' | |
| 80 'sysroot=/usr/local/arm-rootfs ' | |
| 81 'disable_nacl=1 ' | |
| 82 'linux_use_tcmalloc=0 ' | |
| 83 'armv7=1 ' | |
| 84 'arm_thumb=1 ' | |
| 85 'arm_neon=0 ' | |
| 86 'arm_fpu=vfpv3-d16 ' | |
| 87 'chromeos=1 ' # Since this is the intersting variation. | |
| 88 ), | |
| 89 } | |
| 90 | |
| 91 B('Linux', 'linux_clobber', 'compile|testers', 'chromium', | 76 B('Linux', 'linux_clobber', 'compile|testers', 'chromium', |
| 92 notify_on_missing=True) | 77 notify_on_missing=True) |
| 93 F('linux_clobber', linux().ChromiumFactory( | 78 F('linux_clobber', linux().ChromiumFactory( |
| 94 clobber=True, | 79 clobber=True, |
| 95 tests=['check_deps2git', 'sizes', 'check_perms', 'check_licenses'], | 80 tests=['check_deps2git', 'sizes', 'check_perms', 'check_licenses'], |
| 96 options=['--compiler=goma'], | 81 options=['--compiler=goma'], |
| 97 factory_properties={'archive_build': True, | 82 factory_properties={ |
| 98 'gs_bucket': 'gs://chromium-browser-snapshots', | 83 'archive_build': True, |
| 99 'gs_acl': 'public-read', | 84 'gs_bucket': 'gs://chromium-browser-snapshots', |
| 100 'show_perf_results': True, | 85 'gs_acl': 'public-read', |
| 101 'perf_id': 'chromium-rel-linux', | 86 'show_perf_results': True, |
| 102 'expectations': True, | 87 'perf_id': 'chromium-rel-linux', |
| 103 'generate_gtest_json': True, | 88 'expectations': True, |
| 104 'gclient_env': {'GYP_DEFINES':'target_arch=ia32'},})) | 89 'generate_gtest_json': True, |
| 90 'gclient_env': { |
| 91 'GYP_DEFINES': 'target_arch=ia32 tests_run=noop', |
| 92 }, |
| 93 })) |
| 105 | 94 |
| 106 B('Linux x64', 'linux64_clobber', 'compile|testers', 'chromium', | 95 B('Linux x64', 'linux64_clobber', 'compile|testers', 'chromium', |
| 107 notify_on_missing=True) | 96 notify_on_missing=True) |
| 108 F('linux64_clobber', linux().ChromiumFactory( | 97 F('linux64_clobber', linux().ChromiumFactory( |
| 109 clobber=True, | 98 clobber=True, |
| 110 tests=['check_deps2git', 'sizes'], | 99 tests=['check_deps2git', 'sizes'], |
| 111 options=['--compiler=goma'], | 100 options=['--compiler=goma'], |
| 112 factory_properties={ | 101 factory_properties={ |
| 113 'archive_build': True, | 102 'archive_build': True, |
| 114 'gs_bucket': 'gs://chromium-browser-snapshots', | 103 'gs_bucket': 'gs://chromium-browser-snapshots', |
| 115 'gs_acl': 'public-read', | 104 'gs_acl': 'public-read', |
| 116 'show_perf_results': True, | 105 'show_perf_results': True, |
| 117 'generate_gtest_json': True, | 106 'generate_gtest_json': True, |
| 118 'perf_id': 'chromium-rel-linux-64', | 107 'perf_id': 'chromium-rel-linux-64', |
| 119 'expectations': True, | 108 'expectations': True, |
| 120 'gclient_env': {'GYP_DEFINES':'target_arch=x64'}})) | 109 'gclient_env': { |
| 110 'GYP_DEFINES': 'target_arch=x64 tests_run=noop', |
| 111 }, |
| 112 })) |
| 121 | 113 |
| 122 def Update(config, active_master, c): | 114 def Update(config, active_master, c): |
| 123 return helper.Update(c) | 115 return helper.Update(c) |
| OLD | NEW |