Chromium Code Reviews| Index: masters/master.client.v8/master.cfg |
| =================================================================== |
| --- masters/master.client.v8/master.cfg (revision 63753) |
| +++ masters/master.client.v8/master.cfg (working copy) |
| @@ -80,24 +80,45 @@ |
| 'V8 Linux - nosnap - debug', |
| 'V8 Win32', |
| 'V8 Win32 - debug', |
| + 'V8 Win64', |
| 'V8 Mac', |
| 'V8 Mac - debug', |
| 'V8 Linux - arm - sim', |
| 'V8 Linux - arm - sim - debug', |
| - 'XP Perf', |
| 'XP Interactive (dbg)', |
| 'Linux Interactive (dbg)', |
| - 'Mac10.5 Perf', |
| 'Webkit', |
| 'Webkit Mac', |
| 'Webkit Linux', |
| 'Webkit Linux 64']) |
| -c['schedulers'] = [s_v8] |
| -####### BUILDERS |
| +# Scheduler to trigger slaves that depend on the release build. |
| +s_v8_arm_builder = Scheduler(name='v8_arm_builder', |
| + branch='bleeding_edge', |
|
nsylvain
2010/10/25 20:24:49
weird spacing
|
| + treeStableTimer=60, |
| + builderNames=['V8 Arm - builder']) |
| +s_v8_arm_dependent = Dependent('v8_arm_dependent', |
| + s_v8_arm_builder, |
|
nsylvain
2010/10/25 20:24:49
weird spacing
|
| + ['V8 Arm - tester']) |
| + |
| + |
| + |
| +# These builders runs daily. The perf runners because they make the waterfall |
| +# hang. TODO(ricow) - test if this is still the case on the new waterfall. |
| +s_v8_daily= Nightly(name='v8_thrice_daily', |
| + builderNames=['V8 Fuzzer', |
|
nsylvain
2010/10/25 20:24:49
weird spacing
|
| + 'XP Perf', |
| + 'Mac10.5 Perf'], |
| + hour=[19], |
| + minute=30) |
| + |
| + |
| +c['schedulers'] = [s_v8, s_v8_daily, s_v8_arm_builder, s_v8_arm_dependent] |
| + |
| + |
| # buildbot/process/factory.py provides several BuildFactory classes you can |
| # start with, which implement build processes for common targets (GNU |
| # autoconf projects, CPAN perl modules, etc). The factory.BuildFactory is the |
| @@ -113,47 +134,34 @@ |
| # ---------------------------------------------------------------------------- |
| # FACTORIES |
| - |
| m_linux = v8_factory.V8Factory('bleeding_edge', |
| target_platform='linux2') |
| m_linux64 = v8_factory.V8Factory('bleeding_edge', |
| target_platform='linux64') |
| -m_linux_debug = v8_factory.V8Factory('bleeding_edge', |
| - target_platform='linux2') |
| - |
| -m_linux64_debug = v8_factory.V8Factory('bleeding_edge', |
| - target_platform='linux64') |
| - |
| -m_linux_nosnap = v8_factory.V8Factory('bleeding_edge', |
| - target_platform='linux2') |
| - |
| -m_linux_nosnap_debug = v8_factory.V8Factory('bleeding_edge', |
| - target_platform='linux2') |
| - |
| -m_linux_arm_sim = v8_factory.V8Factory('bleeding_edge', |
| - target_platform='linux2') |
| - |
| -m_linux_arm_sim_debug = v8_factory.V8Factory('bleeding_edge', |
| - target_platform='linux2') |
| - |
| m_win32 = v8_factory.V8Factory('bleeding_edge', |
| target_platform='win32') |
| -m_win32_debug = v8_factory.V8Factory('bleeding_edge', |
| - target_platform='win32') |
| - |
| m_mac = v8_factory.V8Factory('bleeding_edge', |
| target_platform='darwin') |
| -m_mac_debug = v8_factory.V8Factory('bleeding_edge', |
| - target_platform='darwin') |
| - |
| -# Note target platform is still win32 - because this is how it is done in scons |
| +# Note target platform is still win32 - because this is how it is done in scons. |
| +# This is intentionally left as a seperate builder in case this changes. |
| m_win64 = v8_factory.V8Factory('bleeding_edge', |
| target_platform='win32') |
| +v8_arm_builder_archive = ('http://%s.jail.google.com/' |
| + 'v8-arm-builder/chrome_staging/' |
| + 'full-build-linux.zip' % |
| + 'jega178') |
| + |
| + |
| +crosstool_prefix = ( |
| + '/usr/local/crosstool-trusted/arm-2009q3/bin/arm-none-linux-gnueabi/' |
| + 'bin/arm-none-linux-gnueabi') |
| + |
| + |
| F = chromium_factory.ChromiumFactory |
| def win(): return F('src/chrome', 'win32') |
| def win_webkit(): return F('src/webkit', 'win32') |
| @@ -163,16 +171,9 @@ |
| # The identifier of the factory is the build configuration. If two factories |
| # are using the same build configuration, they should have the same identifier. |
| -f_v8_linux64 = m_linux64.V8Factory( |
| - identifier='V8-linux64', |
| - options=['snapshot=on', |
| - 'arch=x64', |
| - 'cctests', |
| - 'sample', |
| - '--build-tool=scons_v8'], |
| - tests=['v8testing', 'v8_es5conform', 'sputnik', 'mozilla']) |
| +# The identifier of the factory is the build configuration. If two factories |
| +# are using the same build configuration, they should have the same identifier. |
| - |
| f_v8_linux = m_linux.V8Factory( |
| identifier='V8-linux', |
| options=['snapshot=on', |
| @@ -181,37 +182,44 @@ |
| '--build-tool=scons_v8'], |
| tests=['v8testing', 'v8_es5conform', 'sputnik', 'mozilla', 'presubmit']) |
| - |
| -f_v8_linux64_debug = m_linux_debug.V8Factory( |
| - identifier='V8-linux64-debug', |
| +f_v8_linux_debug = m_linux.V8Factory( |
| + identifier='V8-linux-debug', |
| options=['snapshot=on', |
| 'cctests', |
| 'sample', |
| - 'arch=x64', |
| '--build-tool=scons_v8'], |
| target='debug', |
| tests=['v8testing', 'v8_es5conform', 'sputnik', 'mozilla']) |
| +f_v8_linux64 = m_linux64.V8Factory( |
| + identifier='V8-linux64', |
| + options=['snapshot=on', |
| + 'arch=x64', |
| + 'cctests', |
| + 'sample', |
| + '--build-tool=scons_v8'], |
| + tests=['v8testing', 'v8_es5conform', 'sputnik', 'mozilla'], |
| + target_arch='x64') |
| -f_v8_linux_debug = m_linux64_debug.V8Factory( |
| - identifier='V8-linux-debug', |
| +f_v8_linux64_debug = m_linux64.V8Factory( |
| + identifier='V8-linux64-debug', |
| options=['snapshot=on', |
| 'cctests', |
| 'sample', |
| + 'arch=x64', |
| '--build-tool=scons_v8'], |
| target='debug', |
| - tests=['v8testing', 'v8_es5conform', 'sputnik', 'mozilla']) |
| + tests=['v8testing', 'v8_es5conform', 'sputnik', 'mozilla'], |
| + target_arch='x64') |
| - |
| -f_v8_linux_nosnap = m_linux_nosnap.V8Factory( |
| +f_v8_linux_nosnap = m_linux.V8Factory( |
| identifier='V8-linux-nosnap', |
| options=['cctests', |
| 'sample', |
| '--build-tool=scons_v8'], |
| tests=['v8testing', 'v8_es5conform', 'sputnik', 'mozilla']) |
| - |
| -f_v8_linux_nosnap_debug = m_linux_nosnap_debug.V8Factory( |
| +f_v8_linux_nosnap_debug = m_linux.V8Factory( |
| identifier='V8-linux-nosnap-debug', |
| options=['cctests', |
| 'sample', |
| @@ -219,7 +227,7 @@ |
| target='debug', |
| tests=['v8testing', 'v8_es5conform', 'sputnik', 'mozilla']) |
| -f_v8_linux_arm_sim = m_linux_arm_sim.V8Factory( |
| +f_v8_linux_arm_sim = m_linux.V8Factory( |
| identifier='V8-linux-arm-sim', |
| options=['snapshot=on', |
| 'cctests', |
| @@ -228,7 +236,7 @@ |
| '--build-tool=scons_v8'], |
| tests=['arm']) |
| -f_v8_linux_arm_sim_debug = m_linux_arm_sim_debug.V8Factory( |
| +f_v8_linux_arm_sim_debug = m_linux.V8Factory( |
| identifier='V8-linux-arm-sim-debug', |
| options=['snapshot=on', |
| 'cctests', |
| @@ -239,22 +247,31 @@ |
| tests=['arm']) |
| f_v8_win32 = m_win32.V8Factory( |
| - identifier='V8-win32', |
| - options=['snapshot=on', |
| - 'cctests', |
| - 'sample', |
| - '--build-tool=scons_v8'], |
| - tests=['v8testing', 'v8_es5conform', 'sputnik', 'mozilla']) |
| + identifier='V8-win32', |
| + options=['snapshot=on', |
| + 'cctests', |
| + 'sample', |
| + '--build-tool=scons_v8'], |
| + tests=['v8testing', 'v8_es5conform', 'sputnik', 'mozilla']) |
| -f_v8_win32_debug = m_win32_debug.V8Factory( |
| +f_v8_win32_debug = m_win32.V8Factory( |
| identifier='V8-win32-debug', |
| - options=['snapshot=on', |
| - 'cctests', |
| - 'sample', |
| - '--build-tool=scons_v8'], |
| - target='debug', |
| - tests=['v8testing', 'v8_es5conform', 'sputnik', 'mozilla']) |
| + options=['snapshot=on', |
| + 'cctests', |
| + 'sample', |
| + '--build-tool=scons_v8'], |
| + target='debug', |
| + tests=['v8testing', 'v8_es5conform', 'sputnik', 'mozilla']) |
| +f_v8_win64 = m_win64.V8Factory( |
| + identifier='V8-win64', |
| + options=['cctests', |
| + 'sample', |
| + 'arch=x64', |
| + '--build-tool=scons_v8'], |
| + tests=['v8testing', 'v8_es5conform', 'sputnik', 'mozilla'], |
| + target_arch='x64') |
| + |
| f_v8_mac = m_mac.V8Factory( |
| identifier='V8-mac', |
| options=['snapshot=on', |
| @@ -264,7 +281,7 @@ |
| tests=['v8testing', 'v8_es5conform', 'sputnik', 'mozilla']) |
| -f_v8_mac_debug = m_mac_debug.V8Factory( |
| +f_v8_mac_debug = m_mac.V8Factory( |
| identifier='V8-mac-debug', |
| options=['snapshot=on', |
| 'cctests', |
| @@ -274,14 +291,14 @@ |
| tests=['v8testing', 'v8_es5conform', 'sputnik', 'mozilla']) |
| -f_v8_win64 = m_win64.V8Factory( |
| - identifier='V8-win64', |
| - options=['cctests', |
| - 'sample', |
| - 'arch=x64', |
| - '--build-tool=scons_v8'], |
| - tests=['v8testing', 'v8_es5conform', 'sputnik', 'mozilla']) |
| - |
| +f_v8_fuzz = m_linux.V8Factory( |
| + identifier='V8-fuzz', |
| + options=['cctests', |
| + 'sample', |
| + '--build-tool=scons_v8'], |
| + target='debug,release', |
| + tests=['fuzz']) |
| + |
| f_chromium_rel_perf_xp_dual_v8 = win().ChromiumV8LatestFactory( |
| 'chromium-rel', |
| tests=['page_cycler', 'startup', 'dom_perf', |
| @@ -338,8 +355,27 @@ |
| factory_properties={'archive_webkit_results': True, |
| 'gclient_env': {'GYP_GENERATORS' : 'make'}}) |
| +f_v8_arm_builder = m_linux.V8Factory('V8-arm-builder', |
| + target='release', |
| + tests=[], |
| + compile_timeout=3600, |
| + options=[ |
| + '--build-tool=scons_v8', |
| + 'arch=arm', |
| + 'sample', |
| + 'cctests', |
| + '--crosstool=' + crosstool_prefix], |
| + factory_properties={'archive_build': True} |
| + ) |
| +f_v8_arm_tester = m_linux.V8Factory('V8-arm-tester', |
| + build_url=v8_arm_builder_archive, |
| + target='release', |
| + slave_type='Tester', |
| + tests=['v8testing', 'v8_es5conform', 'sputnik', 'mozilla']) |
| + |
| + |
| # ---------------------------------------------------------------------------- |
| # BUILDER DEFINITIONS |
| @@ -434,6 +470,12 @@ |
| 'factory': f_v8_win64, |
| } |
| +b_v8_fuzz = { |
| + 'name': 'V8 Fuzzer', |
| + 'builddir': 'v8-fuzz', |
| + 'factory': f_v8_fuzz, |
| +} |
| + |
| b_chromium_rel_xp_perf_dual_v8 = { |
| 'name': 'XP Perf', |
| 'builddir': 'chromium-rel-xp-perf-dual-v8', |
| @@ -482,22 +524,37 @@ |
| 'factory': f_webkit_rel_linux64_v8, |
| } |
| +b_v8_arm_builder = { |
| + 'name': 'V8 Arm - builder', |
| + 'builddir': 'v8-arm-builder', |
| + 'factory': f_v8_arm_builder, |
| +} |
| +b_v8_arm_tester = { |
| + 'name': 'V8 Arm - tester', |
| + 'builddir': 'v8-arm-tester', |
| + 'factory': f_v8_arm_tester, |
| +} |
| + |
| + |
| c['builders'] = [b_v8_linux, b_v8_linux_debug, b_v8_linux64, |
| b_v8_linux64_debug, b_v8_linux_nosnap, |
| b_v8_linux_nosnap_debug, b_v8_linux_arm_sim, |
| b_v8_linux_arm_sim_debug, |
| b_v8_win32, b_v8_win32_debug, |
| b_v8_mac, b_v8_mac_debug, |
| - b_v8_win64, |
| - b_chromium_rel_xp_perf_dual_v8, |
| + b_v8_fuzz, |
| + b_webkit_rel_v8, |
| + b_webkit_rel_mac_v8, |
| + b_webkit_rel_linux_v8, |
| b_chromium_dbg_xp_interactive_v8, |
| b_chromium_dbg_linux_interactive_v8, |
| + b_chromium_rel_xp_perf_dual_v8, |
| b_chromium_rel_mac5_perf_v8, |
| - b_webkit_rel_v8, |
| - b_webkit_rel_mac_v8, |
| - b_webkit_rel_linux_v8, |
| - b_webkit_rel_linux64_v8] |
| + b_webkit_rel_linux64_v8, |
| + b_v8_win64, |
| + b_v8_arm_builder, |
| + b_v8_arm_tester] |
| # Associate the slaves to the builders. The configuration is in slaves.cfg. |
| slaves = slaves_list.SlavesList('slaves.cfg', 'v8') |
| @@ -526,3 +583,5 @@ |
| # Buildbot master url: |
| c['buildbotURL'] = 'http://localhost:8010/' |
| +c['projectName'] = ActiveMaster.project_name |
| +c['projectURL'] = config.Master.project_url |