Add Link and Daisy ChromeOS bots

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.
 
 #pylint: disable=C0301
 
 from skia_master_scripts import android_factory
 from skia_master_scripts import chromeos_factory
@@ skipping 22 matching lines @@
   'x86': {'skia_arch_width': '32'},
   'x86_64': {'skia_arch_width': '64'},
   'Arm7': {'skia_arch_width': '32'},
   'NaCl': None,
 }
 
 
 CHROMEOS_BOARD_NAME = {
   'Alex': 'x86-alex',
   'Link': 'link',
-  'daisy': 'daisy',
+  'Daisy': 'daisy',
 }
 
 
 def GetExtraFactoryArgs(compile_builder_info):
   factory_type = compile_builder_info[7]
   if factory_type == android_factory.AndroidFactory:
     # AndroidFactory requires a "device" argument.
     return {'device': utils.CapWordsToUnderscores(compile_builder_info[4])}
   elif factory_type == chromeos_factory.ChromeOSFactory:
     # ChromeOSFactory requires a "board" argument.
@@ skipping 142 matching lines @@
       ('Ubuntu12', 'GCC',    'Debug',   'Arm7',   'Xoom',        None,      True,  f, p) : [('Test', 'Android',  'Xoom',       'Tegra2',      None,          'base-android-xoom')],
       ('Ubuntu12', 'GCC',    'Release', 'Arm7',   'Xoom',        None,      True,  f, p) : [('Test', 'Android',  'Xoom',       'Tegra2',      None,          'base-android-xoom'),
                                                                                             ('Perf', 'Android',  'Xoom',       'Tegra2',      None,          None)],
       ('Ubuntu12', 'GCC',    'Debug',   'x86',    'RazrI',       None,      True,  f, p) : [('Test', 'Android',  'RazrI',      'SGX540',      None,          'base-android-razr-i')],
       ('Ubuntu12', 'GCC',    'Release', 'x86',    'RazrI',       None,      True,  f, p) : [('Test', 'Android',  'RazrI',      'SGX540',      None,          'base-android-razr-i'),
                                                                                             ('Perf', 'Android',  'RazrI',      'SGX540',      None,          None)],})
   f = chromeos_factory.ChromeOSFactory
   builder_specs.update({
       ('Ubuntu12', 'GCC',    'Debug',   'x86',    'Alex',        None,      True,  f, p) : [('Test', 'ChromeOS', 'Alex',       'GMA3150',     None,          None)],
       ('Ubuntu12', 'GCC',    'Release', 'x86',    'Alex',        None,      True,  f, p) : [('Test', 'ChromeOS', 'Alex',       'GMA3150',     None,          None),
-                                                                                            ('Perf', 'ChromeOS', 'Alex',       'GMA3150',     None,          None)],})
+                                                                                            ('Perf', 'ChromeOS', 'Alex',       'GMA3150',     None,          None)],
+      ('Ubuntu12', 'GCC',    'Debug',   'x86_64', 'Link',        None,      True,  f, p) : [('Test', 'ChromeOS', 'Link',       'HD4000',      None,          None)],
+      ('Ubuntu12', 'GCC',    'Release', 'x86_64', 'Link',        None,      True,  f, p) : [('Test', 'ChromeOS', 'Link',       'HD4000',      None,          None),
+                                                                                            ('Perf', 'ChromeOS', 'Link',       'HD4000',      None,          None)],
+      ('Ubuntu12', 'GCC',    'Debug',   'Arm7',   'Daisy',       None,      True,  f, p) : [('Test', 'ChromeOS', 'Daisy',      'MaliT604',    None,          None)],
+      ('Ubuntu12', 'GCC',    'Release', 'Arm7',   'Daisy',       None,      True,  f, p) : [('Test', 'ChromeOS', 'Daisy',      'MaliT604',    None,          None),
+                                                                                            ('Perf', 'ChromeOS', 'Daisy',      'MaliT604',    None,          None)],})
   f = ios_factory.iOSFactory
   p = skia_factory.TARGET_PLATFORM_MAC
   builder_specs.update({
       ('Mac10.7',  'Clang',  'Debug',   'Arm7',   'iOS',         gyp_ios,   True,  f, p) : [],
       ('Mac10.7',  'Clang',  'Release', 'Arm7',   'iOS',         gyp_ios,   True,  f, p) : [],})
 
   for compile_builder in sorted(builder_specs.keys()):
     factory_type = compile_builder[7]
     factory_args = GetExtraFactoryArgs(compile_builder)
     target_platform = compile_builder[8]
@@ skipping 76 matching lines @@
     helper.Builder(builder_name, 'f_%s' % builder_name, scheduler=scheduler)
     helper.Factory('f_%s' % builder_name,
       factory(
         do_upload_results=do_upload_results,
         target_platform=skia_factory.TARGET_PLATFORM_LINUX,
         builder_name=builder_name,
         do_patch_step=(scheduler == utils.TRY_SCHEDULERS_STR),
       ).Build())
 
   return helper.Update(cfg)