Change Builder Names, MkII

master/master_builders_cfg.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Sets up all the builders we want this buildbot master to run.
 
 from skia_master_scripts import factory as skia_factory
+from skia_master_scripts import android_factory
+from skia_master_scripts import chromeos_factory
+from skia_master_scripts import ios_factory
+from skia_master_scripts import nacl_factory
 from skia_master_scripts import utils
 from skia_master_scripts.utils import MakeBuilderSet, \
                                       MakeAndroidBuilderSet, \
+                                      MakeCompileBuilderSet, \
                                       MakeChromeOSBuilderSet, \
-                                      MakeIOSBuilderSet, \
-                                      MakeHousekeeperBuilderSet, \
-                                      MakeNaClBuilderSet
+                                      MakeHousekeeperBuilderSet
 
 # Directory where we want to record performance data
 #
 # TODO(epoger): consider changing to reuse existing config.Master.perf_base_url,
 # config.Master.perf_report_url_suffix, etc.
 perf_output_basedir_linux = '../../../../perfdata'
 perf_output_basedir_mac = perf_output_basedir_linux
 perf_output_basedir_windows = '..\\..\\..\\..\\perfdata'
 
 defaults = {}
@@ skipping 19 matching lines @@
   helper.TryJobRietveld(utils.TRY_SCHEDULER_RIETVELD)
 
   #
   # Set up all the builders.
   #
   # Don't put spaces or 'funny characters' within the builder names, so that
   # we can safely use the builder name as part of a filepath.
   #
   do_upload_results = active_master.is_production_host
 
+  # Compile-only builders.
+  defaults['category'] = ' Build'

[rmistry, 2013/04/25 11:36:45]

Rename to ' Compile' or ' Compilers' ?

+
+  # Linux
+  MakeCompileBuilderSet(

[epoger, 2013/04/24 18:56:10]

Maybe you could compress the builder declaration section by adding a layer to
the helper functions, so that they can build a "set of sets"?

For example, this would cover all of the Linux compile-only builders:

MakeCompileBuilderSetMatrix(
  os_list=['Ubuntu12'],
  compiler_list=['GCC'],
  configuration_list=[
    skia_factory.CONFIG_DEBUG,
    skia_factory.CONFIG_RELEASE,
  ],
  target_arch_list=['32', '64'],

  # the following must be the same for all builders in the matrix
  helper=helper,
  scheduler='skia_rel',
  factory_type=skia_factory.SkiaFactory,
  target_platform=skia_factory.TARGET_PLATFORM_LINUX,
)

MakeCompileBuilderSetMatrix(
  os_list=['Ubuntu12'],
  compiler_list=['GCC'],
  configuration_list=[
    skia_factory.CONFIG_DEBUG,
    skia_factory.CONFIG_RELEASE,
  ],
  target_arch_list=['64'],

  # the following must be the same for all builders in the matrix
  helper=helper,
  scheduler='skia_rel',
  factory_type=skia_factory.SkiaFactory,
  target_platform=skia_factory.TARGET_PLATFORM_LINUX,
  extra_config='NoGPU',
  add_to_gyp_defines='skia_gpu=0',
)


It could be even shorter if various items were set to their common value by
default:

helper=helper,
scheduler='skia_rel',
factory_type=skia_factory.SkiaFactory,
configuration_list = [skia_factory.CONFIG_DEBUG, skia_factory.CONFIG_RELEASE],
target_arch_list=['32', '64'],

+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_DEBUG,
+      target_arch='32',
+      factory_type=skia_factory.SkiaFactory,
+      target_platform=skia_factory.TARGET_PLATFORM_LINUX,
+      environment_variables={'GYP_DEFINES': 'skia_arch_width=32'},
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(

[rmistry, 2013/04/25 11:36:45]

You could do some serious compression here by looping through tuples, something
like this:

# Contains tuples of (OS, compiler, bit, ....)
compilebot_specs = [
  # Linux
  ('Ubuntu12', 'GCC', '32', target_platform, extra_config),
  ...
  # Android
  ...
]

for compilebot_spec in compilebot_specs:
  MakeCompileBuilderSet(.......)

It will be more readable and may save you a 100 of so lines.

+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_RELEASE,
+      target_arch='32',
+      factory_type=skia_factory.SkiaFactory,
+      target_platform=skia_factory.TARGET_PLATFORM_LINUX,
+      environment_variables={'GYP_DEFINES': 'skia_arch_width=32'},
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_DEBUG,
+      target_arch='64',
+      factory_type=skia_factory.SkiaFactory,
+      target_platform=skia_factory.TARGET_PLATFORM_LINUX,
+      environment_variables={'GYP_DEFINES': 'skia_arch_width=64'},
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_RELEASE,
+      target_arch='64',
+      factory_type=skia_factory.SkiaFactory,
+      target_platform=skia_factory.TARGET_PLATFORM_LINUX,
+      environment_variables={'GYP_DEFINES': 'skia_arch_width=64'},
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_DEBUG,
+      target_arch='64',
+      extra_config='NoGPU',
+      factory_type=skia_factory.SkiaFactory,
+      target_platform=skia_factory.TARGET_PLATFORM_LINUX,
+      environment_variables={'GYP_DEFINES': 'skia_gpu=0 skia_arch_width=64'},
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_RELEASE,
+      target_arch='64',
+      extra_config='NoGPU',
+      factory_type=skia_factory.SkiaFactory,
+      target_platform=skia_factory.TARGET_PLATFORM_LINUX,
+      environment_variables={'GYP_DEFINES': 'skia_gpu=0 skia_arch_width=64'},
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_DEBUG,
+      target_arch='NaCl',
+      factory_type=nacl_factory.NaClFactory,
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_RELEASE,
+      target_arch='NaCl',
+      factory_type=nacl_factory.NaClFactory,
+      target_platform=skia_factory.TARGET_PLATFORM_LINUX,
+      compile_warnings_as_errors=True)
+
+  # Android
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_DEBUG,
+      target_arch='32',
+      extra_config='NexusS',
+      device='nexus_s',
+      factory_type=android_factory.AndroidFactory,
+      target_platform=skia_factory.TARGET_PLATFORM_LINUX,
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_RELEASE,
+      target_arch='32',
+      extra_config='NexusS',
+      device='nexus_s',
+      factory_type=android_factory.AndroidFactory,
+      target_platform=skia_factory.TARGET_PLATFORM_LINUX,
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_DEBUG,
+      target_arch='32',
+      extra_config='Nexus4',
+      device='nexus_4',
+      factory_type=android_factory.AndroidFactory,
+      target_platform=skia_factory.TARGET_PLATFORM_LINUX,
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_RELEASE,
+      target_arch='32',
+      extra_config='Nexus4',
+      device='nexus_4',
+      factory_type=android_factory.AndroidFactory,
+      target_platform=skia_factory.TARGET_PLATFORM_LINUX,
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_DEBUG,
+      target_arch='32',
+      extra_config='Nexus7',
+      device='nexus_7',
+      factory_type=android_factory.AndroidFactory,
+      target_platform=skia_factory.TARGET_PLATFORM_LINUX,
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_RELEASE,
+      target_arch='32',
+      extra_config='Nexus7',
+      device='nexus_7',
+      factory_type=android_factory.AndroidFactory,
+      target_platform=skia_factory.TARGET_PLATFORM_LINUX,
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_DEBUG,
+      target_arch='32',
+      extra_config='Nexus10',
+      device='nexus_10',
+      factory_type=android_factory.AndroidFactory,
+      target_platform=skia_factory.TARGET_PLATFORM_LINUX,
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_RELEASE,
+      target_arch='32',
+      extra_config='Nexus10',
+      device='nexus_10',
+      factory_type=android_factory.AndroidFactory,
+      target_platform=skia_factory.TARGET_PLATFORM_LINUX,
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_DEBUG,
+      target_arch='32',
+      extra_config='Xoom',
+      device='xoom',
+      factory_type=android_factory.AndroidFactory,
+      target_platform=skia_factory.TARGET_PLATFORM_LINUX,
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_RELEASE,
+      target_arch='32',
+      extra_config='Xoom',
+      device='xoom',
+      factory_type=android_factory.AndroidFactory,
+      target_platform=skia_factory.TARGET_PLATFORM_LINUX,
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_DEBUG,
+      target_arch='32',
+      extra_config='GalaxyNexus',
+      device='galaxy_nexus',
+      factory_type=android_factory.AndroidFactory,
+      target_platform=skia_factory.TARGET_PLATFORM_LINUX,
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_RELEASE,
+      target_arch='32',
+      extra_config='GalaxyNexus',
+      device='galaxy_nexus',
+      factory_type=android_factory.AndroidFactory,
+      target_platform=skia_factory.TARGET_PLATFORM_LINUX,
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_DEBUG,
+      target_arch='32',
+      extra_config='RazrI',
+      device='razr_i',
+      factory_type=android_factory.AndroidFactory,
+      target_platform=skia_factory.TARGET_PLATFORM_LINUX,
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_RELEASE,
+      target_arch='32',
+      extra_config='RazrI',
+      device='razr_i',
+      factory_type=android_factory.AndroidFactory,
+      target_platform=skia_factory.TARGET_PLATFORM_LINUX,
+      compile_warnings_as_errors=True)
+
+  # ChromeOS
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_DEBUG,
+      target_arch='32',
+      extra_config='ChromeOS',
+      factory_type=chromeos_factory.ChromeOSFactory,
+      target_platform=skia_factory.TARGET_PLATFORM_LINUX,
+      environment_variables={'GYP_DEFINES': 'skia_arch_width=32 skia_gpu=0'},
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Ubuntu12',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_RELEASE,
+      target_arch='32',
+      extra_config='ChromeOS',
+      factory_type=chromeos_factory.ChromeOSFactory,
+      target_platform=skia_factory.TARGET_PLATFORM_LINUX,
+      environment_variables={'GYP_DEFINES': 'skia_arch_width=32 skia_gpu=0'},
+      compile_warnings_as_errors=True)
+
+  # Mac
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Mac10.6',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_DEBUG,
+      target_arch='32',
+      factory_type=skia_factory.SkiaFactory,
+      target_platform=skia_factory.TARGET_PLATFORM_MAC,
+      environment_variables=
+          {'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_arch_width=32'},
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Mac10.6',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_RELEASE,
+      target_arch='32',
+      factory_type=skia_factory.SkiaFactory,
+      target_platform=skia_factory.TARGET_PLATFORM_MAC,
+      environment_variables=
+          {'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_arch_width=32'},
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Mac10.6',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_DEBUG,
+      target_arch='64',
+      factory_type=skia_factory.SkiaFactory,
+      target_platform=skia_factory.TARGET_PLATFORM_MAC,
+      environment_variables=
+          {'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_arch_width=64'},
+      compile_warnings_as_errors=False)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Mac10.6',
+      compiler='GCC',
+      configuration=skia_factory.CONFIG_RELEASE,
+      target_arch='64',
+      factory_type=skia_factory.SkiaFactory,
+      target_platform=skia_factory.TARGET_PLATFORM_MAC,
+      environment_variables=
+          {'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_arch_width=64'},
+      compile_warnings_as_errors=False)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Mac10.7',
+      compiler='Clang',
+      configuration=skia_factory.CONFIG_DEBUG,
+      target_arch='32',
+      factory_type=skia_factory.SkiaFactory,
+      target_platform=skia_factory.TARGET_PLATFORM_MAC,
+      environment_variables={'GYP_DEFINES': 'skia_mesa=1 skia_arch_width=32'},
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Mac10.7',
+      compiler='Clang',
+      configuration=skia_factory.CONFIG_RELEASE,
+      target_arch='32',
+      factory_type=skia_factory.SkiaFactory,
+      target_platform=skia_factory.TARGET_PLATFORM_MAC,
+      environment_variables={'GYP_DEFINES': 'skia_mesa=1 skia_arch_width=32'},
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Mac10.7',
+      compiler='Clang',
+      configuration=skia_factory.CONFIG_DEBUG,
+      target_arch='64',
+      factory_type=skia_factory.SkiaFactory,
+      target_platform=skia_factory.TARGET_PLATFORM_MAC,
+      environment_variables={'GYP_DEFINES': 'skia_mesa=1 skia_arch_width=64'},
+      compile_warnings_as_errors=False)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Mac10.7',
+      compiler='Clang',
+      configuration=skia_factory.CONFIG_RELEASE,
+      target_arch='64',
+      factory_type=skia_factory.SkiaFactory,
+      target_platform=skia_factory.TARGET_PLATFORM_MAC,
+      environment_variables={'GYP_DEFINES': 'skia_mesa=1 skia_arch_width=64'},
+      compile_warnings_as_errors=False)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Mac10.8',
+      compiler='Clang',
+      configuration=skia_factory.CONFIG_DEBUG,
+      target_arch='32',
+      factory_type=skia_factory.SkiaFactory,
+      target_platform=skia_factory.TARGET_PLATFORM_MAC,
+      environment_variables={'GYP_DEFINES': 'skia_arch_width=32'},
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Mac10.8',
+      compiler='Clang',
+      configuration=skia_factory.CONFIG_RELEASE,
+      target_arch='32',
+      factory_type=skia_factory.SkiaFactory,
+      target_platform=skia_factory.TARGET_PLATFORM_MAC,
+      environment_variables={'GYP_DEFINES': 'skia_arch_width=32'},
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Mac10.8',
+      compiler='Clang',
+      configuration=skia_factory.CONFIG_DEBUG,
+      target_arch='64',
+      factory_type=skia_factory.SkiaFactory,
+      target_platform=skia_factory.TARGET_PLATFORM_MAC,
+      environment_variables={'GYP_DEFINES': 'skia_arch_width=64'},
+      compile_warnings_as_errors=False)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Mac10.8',
+      compiler='Clang',
+      configuration=skia_factory.CONFIG_RELEASE,
+      target_arch='64',
+      factory_type=skia_factory.SkiaFactory,
+      target_platform=skia_factory.TARGET_PLATFORM_MAC,
+      environment_variables={'GYP_DEFINES': 'skia_arch_width=64'},
+      compile_warnings_as_errors=False)
+
+  # Windows
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Win7',
+      compiler='VS2010',
+      configuration=skia_factory.CONFIG_DEBUG,
+      target_arch='32',
+      factory_type=skia_factory.SkiaFactory,
+      target_platform=skia_factory.TARGET_PLATFORM_WIN32,
+      environment_variables=
+          {'GYP_DEFINES': ('skia_arch_width=32 '
+                           'skia_win_debuggers_path=c:/DbgHelp')},
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Win7',
+      compiler='VS2010',
+      configuration=skia_factory.CONFIG_RELEASE,
+      target_arch='32',
+      factory_type=skia_factory.SkiaFactory,
+      target_platform=skia_factory.TARGET_PLATFORM_WIN32,
+      environment_variables=
+          {'GYP_DEFINES': ('skia_arch_width=32 '
+                           'skia_win_debuggers_path=c:/DbgHelp')},
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Win7',
+      compiler='VS2010',
+      configuration=skia_factory.CONFIG_DEBUG,
+      target_arch='64',
+      factory_type=skia_factory.SkiaFactory,
+      target_platform=skia_factory.TARGET_PLATFORM_WIN32,
+      environment_variables=
+          {'GYP_DEFINES': ('skia_arch_width=64 '
+                           'skia_win_debuggers_path=c:/DbgHelp')},
+      compile_warnings_as_errors=False)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Win7',
+      compiler='VS2010',
+      configuration=skia_factory.CONFIG_RELEASE,
+      target_arch='64',
+      factory_type=skia_factory.SkiaFactory,
+      target_platform=skia_factory.TARGET_PLATFORM_WIN32,
+      environment_variables=
+          {'GYP_DEFINES': ('skia_arch_width=64 '
+                           'skia_win_debuggers_path=c:/DbgHelp')},
+      compile_warnings_as_errors=False)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Win7',
+      compiler='VS2010',
+      configuration=skia_factory.CONFIG_DEBUG,
+      target_arch='32',
+      extra_config='ANGLE',
+      factory_type=skia_factory.SkiaFactory,
+      target_platform=skia_factory.TARGET_PLATFORM_WIN32,
+      environment_variables=
+          {'GYP_DEFINES': ('skia_angle=1 skia_arch_width=32 '
+                           'skia_win_debuggers_path=c:/DbgHelp')},
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Win7',
+      compiler='VS2010',
+      configuration=skia_factory.CONFIG_RELEASE,
+      target_arch='32',
+      extra_config='ANGLE',
+      factory_type=skia_factory.SkiaFactory,
+      target_platform=skia_factory.TARGET_PLATFORM_WIN32,
+      environment_variables=
+          {'GYP_DEFINES': ('skia_angle=1 skia_arch_width=32 '
+                           'skia_win_debuggers_path=c:/DbgHelp')},
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Win7',
+      compiler='VS2010',
+      configuration=skia_factory.CONFIG_DEBUG,
+      target_arch='32',
+      extra_config='DirectWrite',
+      factory_type=skia_factory.SkiaFactory,
+      target_platform=skia_factory.TARGET_PLATFORM_WIN32,
+      environment_variables=
+          {'GYP_DEFINES': ('skia_directwrite=1 skia_arch_width=32 '
+                           'skia_win_debuggers_path=c:/DbgHelp')},
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Win7',
+      compiler='VS2010',
+      configuration=skia_factory.CONFIG_RELEASE,
+      target_arch='32',
+      extra_config='DirectWrite',
+      factory_type=skia_factory.SkiaFactory,
+      target_platform=skia_factory.TARGET_PLATFORM_WIN32,
+      environment_variables=
+          {'GYP_DEFINES': ('skia_directwrite=1 skia_arch_width=32 '
+                           'skia_win_debuggers_path=c:/DbgHelp')},
+      compile_warnings_as_errors=True)
+
+  # iOS
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Mac10.7',
+      compiler='Clang',
+      configuration=skia_factory.CONFIG_DEBUG,
+      target_arch='32',
+      extra_config='iOS',
+      factory_type=ios_factory.iOSFactory,
+      target_platform=skia_factory.TARGET_PLATFORM_MAC,
+      environment_variables={'GYP_DEFINES': 'skia_os=ios'},
+      compile_warnings_as_errors=True)
+  MakeCompileBuilderSet(
+      helper=helper,
+      scheduler='skia_rel',
+      os='Mac10.7',
+      compiler='Clang',
+      configuration=skia_factory.CONFIG_RELEASE,
+      target_arch='32',
+      extra_config='iOS',
+      factory_type=ios_factory.iOSFactory,
+      target_platform=skia_factory.TARGET_PLATFORM_MAC,
+      environment_variables={'GYP_DEFINES': 'skia_os=ios'},
+      compile_warnings_as_errors=True)
+
+  # Builders which run a full set of BuildSteps
+
   # Linux (Ubuntu12) on Shuttle with ATI5770 graphics card
   defaults['category'] = 'Linux'
   MakeBuilderSet(

[rmistry, 2013/04/25 11:36:45]

Could do the same tuple looping here as above for each category.

       helper=helper,
-      builder_base_name='Skia_Shuttle_Ubuntu12_ATI5770_Float_%s_64',
+      os='Ubuntu12',

[epoger, 2013/04/24 18:56:10]

[similar matrix factory idea as proposed above]

+      model='ShuttleA',
+      gpu='ATI5770',
+      arch_width='64',
       do_upload_results=do_upload_results,
       target_platform=skia_factory.TARGET_PLATFORM_LINUX,
-      environment_variables=
-          {'GYP_DEFINES': 'skia_scalar=float skia_mesa=0 skia_arch_width=64'},
+      environment_variables={'GYP_DEFINES': 'skia_arch_width=64'},
       gm_image_subdir='base-shuttle_ubuntu12_ati5770',
       perf_output_basedir=perf_output_basedir_linux)
   MakeBuilderSet(
       helper=helper,
-      builder_base_name='Skia_Shuttle_Ubuntu12_ATI5770_Float_%s_32',
+      os='Ubuntu12',
+      model='ShuttleA',
+      gpu='ATI5770',
+      arch_width='32',
       do_upload_results=do_upload_results,
       target_platform=skia_factory.TARGET_PLATFORM_LINUX,
-      environment_variables=
-          {'GYP_DEFINES': 'skia_scalar=float skia_mesa=0 skia_arch_width=32'},
+      environment_variables={'GYP_DEFINES': 'skia_arch_width=32'},
       gm_image_subdir='base-shuttle_ubuntu12_ati5770',
       perf_output_basedir=perf_output_basedir_linux)
 
   # Android (runs on a Linux buildbot slave)...
   defaults['category'] = 'Android'
   MakeAndroidBuilderSet(
       helper=helper,
-      builder_base_name='Skia_NexusS_4-1_Float_%s_32',
+      os='Android',
+      gpu='SGX540',
+      arch_width='32',
       device='nexus_s',
       do_upload_results=do_upload_results,
       target_platform=skia_factory.TARGET_PLATFORM_LINUX,
-      environment_variables={'GYP_DEFINES': 'skia_scalar=float skia_mesa=0'},
       gm_image_subdir='base-android-nexus-s',
       perf_output_basedir=perf_output_basedir_linux)
   MakeAndroidBuilderSet(
       helper=helper,
-      builder_base_name='Skia_Xoom_4-1_Float_%s_32',
+      os='Android',
+      gpu='Tegra2',
+      arch_width='32',
       device='xoom',
       do_upload_results=do_upload_results,
       target_platform=skia_factory.TARGET_PLATFORM_LINUX,
-      environment_variables={'GYP_DEFINES': 'skia_scalar=float skia_mesa=0'},
       gm_image_subdir='base-android-xoom',
       perf_output_basedir=perf_output_basedir_linux)
   MakeAndroidBuilderSet(
       helper=helper,
-      builder_base_name='Skia_GalaxyNexus_4-1_Float_%s_32',
+      os='Android',
+      gpu='SGX540',
+      arch_width='32',
       device='galaxy_nexus',
       do_upload_results=do_upload_results,
       target_platform=skia_factory.TARGET_PLATFORM_LINUX,
-      environment_variables={'GYP_DEFINES': 'skia_scalar=float skia_mesa=0'},
       gm_image_subdir='base-android-galaxy-nexus',
       perf_output_basedir=perf_output_basedir_linux)
   MakeAndroidBuilderSet(
       helper=helper,
-      builder_base_name='Skia_Nexus4_4-1_Float_%s_32',
+      os='Android',
+      gpu='Adreno320',
+      arch_width='32',
       device='nexus_4',
       do_upload_results=do_upload_results,
       target_platform=skia_factory.TARGET_PLATFORM_LINUX,
-      environment_variables={'GYP_DEFINES': 'skia_scalar=float skia_mesa=0'},
       gm_image_subdir='base-android-nexus-4',
       perf_output_basedir=perf_output_basedir_linux)
   MakeAndroidBuilderSet(
       helper=helper,
-      builder_base_name='Skia_Nexus7_4-1_Float_%s_32',
+      os='Android',
+      gpu='Tegra3',
+      arch_width='32',
       device='nexus_7',
       do_upload_results=do_upload_results,
       target_platform=skia_factory.TARGET_PLATFORM_LINUX,
-      environment_variables={'GYP_DEFINES': 'skia_scalar=float skia_mesa=0'},
       gm_image_subdir='base-android-nexus-7',
       perf_output_basedir=perf_output_basedir_linux)
   MakeAndroidBuilderSet(
       helper=helper,
-      builder_base_name='Skia_Nexus10_4-1_Float_%s_32',
+      os='Android',
+      gpu='MaliT604',
+      arch_width='32',
       device='nexus_10',
       do_upload_results=do_upload_results,
       target_platform=skia_factory.TARGET_PLATFORM_LINUX,
-      environment_variables={'GYP_DEFINES': 'skia_scalar=float skia_mesa=0'},
       gm_image_subdir='base-android-nexus-10',
       perf_output_basedir=perf_output_basedir_linux)
   MakeAndroidBuilderSet(
       helper=helper,
-      builder_base_name='Skia_RazrI_4-1_Float_%s_32',
-      device='x86',
+      os='Android',
+      gpu='SGX540',
+      arch_width='32',
+      device='razr_i',
       do_upload_results=do_upload_results,
       target_platform=skia_factory.TARGET_PLATFORM_LINUX,
-      environment_variables={'GYP_DEFINES': 'skia_scalar=float skia_mesa=0'},
       gm_image_subdir='base-android-razr-i',
       perf_output_basedir=perf_output_basedir_linux)
 
   # Mac 10.6 (SnowLeopard) ...
   defaults['category'] = 'Mac-10.6'
   MakeBuilderSet(
       helper=helper,
-      builder_base_name='Skia_Mac_Float_%s_32',
+      os='Mac10.6',
+      model='MacMini4.1',
+      gpu='GeForce320M',
+      arch_width='32',
       do_upload_results=do_upload_results,
       target_platform=skia_factory.TARGET_PLATFORM_MAC,
       environment_variables=
-          {'GYP_DEFINES': ('skia_osx_sdkroot=macosx10.6 skia_scalar=float '
-                           'skia_arch_width=32')},
+          {'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_arch_width=32'},
       gm_image_subdir='base-macmini',
       perf_output_basedir=perf_output_basedir_mac)
   MakeBuilderSet(
       helper=helper,
-      builder_base_name='Skia_Mac_Float_%s_64',
+      os='Mac10.6',
+      model='MacMini4.1',
+      gpu='GeForce320M',
+      arch_width='64',
       do_upload_results=do_upload_results,
       target_platform=skia_factory.TARGET_PLATFORM_MAC,
       environment_variables=
-          {'GYP_DEFINES': ('skia_osx_sdkroot=macosx10.6 skia_scalar=float '
-                           'skia_arch_width=64')},
+          {'GYP_DEFINES': 'skia_osx_sdkroot=macosx10.6 skia_arch_width=64'},
       gm_image_subdir='base-macmini',
-      perf_output_basedir=perf_output_basedir_mac,
-      compile_bot_warnings_as_errors=False)
+      perf_output_basedir=perf_output_basedir_mac)
 
   # Mac 10.7 (Lion) ...
   defaults['category'] = 'Mac-10.7'
   MakeBuilderSet(
       helper=helper,
-      builder_base_name='Skia_MacMiniLion_Float_%s_32',
+      os='Mac10.7',
+      model='MacMini4.1',
+      gpu='GeForce320M',
+      arch_width='32',
       do_upload_results=do_upload_results,
       target_platform=skia_factory.TARGET_PLATFORM_MAC,
-      environment_variables=
-          {'GYP_DEFINES': 'skia_scalar=float skia_mesa=1 skia_arch_width=32'},
+      environment_variables={'GYP_DEFINES': 'skia_mesa=1 skia_arch_width=32'},
       gm_image_subdir='base-macmini-lion-float',
       perf_output_basedir=perf_output_basedir_mac)
   MakeBuilderSet(
       helper=helper,
-      builder_base_name='Skia_MacMiniLion_Float_%s_64',
+      os='Mac10.7',
+      model='MacMini4.1',
+      gpu='GeForce320M',
+      arch_width='64',
       do_upload_results=do_upload_results,
       target_platform=skia_factory.TARGET_PLATFORM_MAC,
-      environment_variables=
-          {'GYP_DEFINES': 'skia_scalar=float skia_mesa=1 skia_arch_width=64'},
+      environment_variables={'GYP_DEFINES': 'skia_mesa=1 skia_arch_width=64'},
       gm_image_subdir='base-macmini-lion-float',
-      perf_output_basedir=perf_output_basedir_mac,
-      compile_bot_warnings_as_errors=False)
+      perf_output_basedir=perf_output_basedir_mac)
 
   # Mac 10.8 (Mountain Lion) ...
   defaults['category'] = 'Mac-10.8'
   MakeBuilderSet(
       helper=helper,
-      builder_base_name='Skia_MacMini_10_8_Float_%s_32',
+      os='Mac10.8',
+      model='MacMini4.1',
+      gpu='GeForce320M',
+      arch_width='32',
       do_upload_results=do_upload_results,
       target_platform=skia_factory.TARGET_PLATFORM_MAC,
-      environment_variables=
-          {'GYP_DEFINES': 'skia_scalar=float skia_arch_width=32'},
+      environment_variables={'GYP_DEFINES': 'skia_arch_width=32'},
       gm_image_subdir='base-macmini-10_8',
       perf_output_basedir=perf_output_basedir_mac)
   MakeBuilderSet(
       helper=helper,
-      builder_base_name='Skia_MacMini_10_8_Float_%s_64',
+      os='Mac10.8',
+      model='MacMini4.1',
+      gpu='GeForce320M',
+      arch_width='64',
       do_upload_results=do_upload_results,
       target_platform=skia_factory.TARGET_PLATFORM_MAC,
-      environment_variables=
-          {'GYP_DEFINES': 'skia_scalar=float skia_arch_width=64'},
+      environment_variables={'GYP_DEFINES': 'skia_arch_width=64'},
       gm_image_subdir='base-macmini-10_8',
-      perf_output_basedir=perf_output_basedir_mac,
-      compile_bot_warnings_as_errors=False)
+      perf_output_basedir=perf_output_basedir_mac)
 
   # Windows7 running on Shuttle PC with Intel Core i7-2600 with on-CPU graphics
   defaults['category'] = 'Win7'
   MakeBuilderSet(
       helper=helper,
-      builder_base_name='Skia_Shuttle_Win7_Intel_Float_%s_32',
+      os='Win7',
+      model='ShuttleA',
+      gpu='HD2000',
+      arch_width='32',
       do_upload_results=do_upload_results,
       target_platform=skia_factory.TARGET_PLATFORM_WIN32,
       environment_variables=
-          {'GYP_DEFINES': ('skia_scalar=float skia_arch_width=32 '
+          {'GYP_DEFINES': ('skia_arch_width=32 '
                            'skia_win_debuggers_path=c:/DbgHelp')},
       gm_image_subdir='base-shuttle-win7-intel-float',
       perf_output_basedir=perf_output_basedir_windows)
   MakeBuilderSet(
       helper=helper,
-      builder_base_name='Skia_Shuttle_Win7_Intel_Float_%s_64',
+      os='Win7',
+      model='ShuttleA',
+      gpu='HD2000',
+      arch_width='64',
       do_upload_results=do_upload_results,
       target_platform=skia_factory.TARGET_PLATFORM_WIN32,
       environment_variables=
           {'GYP_DEFINES': ('skia_scalar=float skia_arch_width=64 '
                            'skia_win_debuggers_path=c:/DbgHelp')},
       gm_image_subdir='base-shuttle-win7-intel-float',
-      perf_output_basedir=perf_output_basedir_windows,
-      compile_bot_warnings_as_errors=False)
+      perf_output_basedir=perf_output_basedir_windows)
 
   # Special-purpose Win7 builders
   defaults['category'] = 'Win7-Special'
   MakeBuilderSet(
       helper=helper,
-      builder_base_name='Skia_Shuttle_Win7_Intel_Float_ANGLE_%s_32',
+      os='Win7',
+      model='ShuttleA',
+      gpu='HD2000',
+      arch_width='32',
+      extra_config='ANGLE',
       do_upload_results=do_upload_results,
       target_platform=skia_factory.TARGET_PLATFORM_WIN32,
       environment_variables=
-          {'GYP_DEFINES': ('skia_scalar=float skia_angle=1 skia_arch_width=32 '
+          {'GYP_DEFINES': ('skia_angle=1 skia_arch_width=32 '
                            'skia_win_debuggers_path=c:/DbgHelp')},
       gm_image_subdir='base-shuttle-win7-intel-angle',
       perf_output_basedir=perf_output_basedir_windows,
       gm_args=['--config', 'angle'],
       bench_args=['--config', 'ANGLE'],
       bench_pictures_cfg='angle')
   MakeBuilderSet(
       helper=helper,
-      builder_base_name='Skia_Shuttle_Win7_Intel_Float_DirectWrite_%s_32',
+      os='Win7',
+      model='ShuttleA',
+      gpu='HD2000',
+      arch_width='32',
+      extra_config='DirectWrite',
       do_upload_results=do_upload_results,
       target_platform=skia_factory.TARGET_PLATFORM_WIN32,
       environment_variables=
-          {'GYP_DEFINES':
-           ('skia_scalar=float skia_directwrite=1 skia_arch_width=32 '
-            'skia_win_debuggers_path=c:/DbgHelp')},
+          {'GYP_DEFINES': ('skia_directwrite=1 skia_arch_width=32 '
+                           'skia_win_debuggers_path=c:/DbgHelp')},
       gm_image_subdir='base-shuttle-win7-intel-directwrite',
       perf_output_basedir=perf_output_basedir_windows)
 
-  defaults['category'] = 'iOS'
-  MakeIOSBuilderSet(
-      helper=helper,
-      builder_base_name='Skia_iOS_%s_32',
-      do_upload_results=do_upload_results,
-      target_platform=skia_factory.TARGET_PLATFORM_MAC,
-      environment_variables={'GYP_DEFINES': 'skia_os=ios'},
-      gm_image_subdir=None,
-      perf_output_basedir=None,
-      do_debug=False,
-      do_release=False,
-      do_bench=False)
-
   # House Keeping
   defaults['category'] = '  Housekeeping'
   MakeHousekeeperBuilderSet(
       helper=helper,
       do_trybots=True,
       do_upload_results=do_upload_results)
 
   # "Special" bots, running on Linux
   defaults['category'] = 'Linux-Special'
   MakeBuilderSet(
       helper=helper,
-      builder_base_name='Skia_Linux_NoGPU_%s_32',
+      os='Ubuntu12',
+      model='ShuttleA',
+      gpu='NoGPU',
+      arch_width='64',
       do_upload_results=do_upload_results,
       target_platform=skia_factory.TARGET_PLATFORM_LINUX,
-      environment_variables=
-          {'GYP_DEFINES': 'skia_scalar=float skia_gpu=0 skia_arch_width=64'},
+      environment_variables={'GYP_DEFINES': 'skia_gpu=0 skia_arch_width=64'},
       gm_image_subdir='base-shuttle_ubuntu12_ati5770',
       perf_output_basedir=None, # no perf measurement for debug builds
       bench_pictures_cfg='no_gpu',
       do_release=False,
       do_bench=False)
 
-  MakeNaClBuilderSet(
-      helper=helper,
-      builder_base_name='Skia_Shuttle_Ubuntu12_NaCl_%s',
-      do_upload_results=do_upload_results,
-      target_platform=skia_factory.TARGET_PLATFORM_LINUX,
-      gm_image_subdir=None,
-      perf_output_basedir=None,
-      do_debug=False,
-      do_release=False,
-      do_bench=False)
-
   # Chrome OS
   defaults['category'] = 'ChromeOS'
   MakeChromeOSBuilderSet(
       helper=helper,
-      builder_base_name='Skia_ChromeOS_Alex_%s_32',
+      os='ChromeOS',
+      model='Alex',
+      gpu='GMA3150',
+      arch_width='32',
       do_upload_results=do_upload_results,
       target_platform=skia_factory.TARGET_PLATFORM_LINUX,
-      environment_variables=
-          {'GYP_DEFINES': 'skia_arch_width=32 skia_gpu=0'},
+      environment_variables={'GYP_DEFINES': 'skia_arch_width=32 skia_gpu=0'},
       gm_image_subdir=None,
       perf_output_basedir=perf_output_basedir_linux,
       bench_pictures_cfg='no_gpu')
 
   return helper.Update(c)