Fixing tryserver config mistakes preventing master restart.

masters/master.tryserver.nacl/master.cfg

 # -*- python -*-
 # ex: set syntax=python:
 
 # Copyright (c) 2011 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.
 
 # READ THIS:
 # See http://dev.chromium.org/developers/testing/chromium-build-infrastructure
 
@@ skipping 48 matching lines @@
 m_linux['nacl'] = nacl_factory.NativeClientFactory(
     'native_client', 'linux2', use_supplement=True,
     switched_to_annotations=True).NativeClientFactory
 m_mac['nacl'] = nacl_factory.NativeClientFactory(
     'native_client', 'darwin', use_supplement=True,
     switched_to_annotations=True).NativeClientFactory
 m_arm['nacl'] = nacl_factory.NativeClientFactory(
     'native_client', 'arm', use_supplement=True,
     switched_to_annotations=True).NativeClientFactory
 
+for platform in [m_win32, m_win64, m_mac, m_linux, m_arm]:
+  platform['nacl-toolchain'] = platform['nacl']
+
 m_win64['naclsdk'] = nacl_sdk_factory.NativeClientSDKFactory(
     'native_client', 'wincyg').NativeClientSDKFactory
 m_linux['naclsdk'] = nacl_sdk_factory.NativeClientSDKFactory(
     'native_client', 'linux2').NativeClientSDKFactory
 m_mac['naclsdk'] = nacl_sdk_factory.NativeClientSDKFactory(
     'native_client', 'darwin').NativeClientSDKFactory
 
 m_win32['gyp'] = gyp_factory.GYPFactory('trunk',
     target_platform='win32').GYPFactory
 m_win64['gyp'] = gyp_factory.GYPFactory('trunk',
     target_platform='win64').GYPFactory
 m_mac['gyp'] = gyp_factory.GYPFactory('trunk',
     target_platform='darwin').GYPFactory
 m_linux['gyp'] = gyp_factory.GYPFactory('trunk',
     target_platform='linux2').GYPFactory
 
 
 def CreateBot(platform, password=config.Master.GetBotPassword(),
               builder_name=None, target=None, project=None,

[Matt Ball, 2011/03/30 17:26:55]

Shouldn't we just change the default to be 'dbg' instead of None?

               tests=None, options=None, mode=None, timeout=1200,
               slave_names=None, factory_properties=None):
   """Generates and register a builder along with its slave(s).
 
   Implicitly register slave_name or slave_names if they weren't registered yet.
   If none of slave_name or slave_names is supplied, a slave name will be
   constructed from the builder name."""
   if platform not in ('win32', 'win64', 'linux', 'mac', 'arm'):
     raise Exception(platform + ' is not an known os type')
+  if not target:
+    target = 'dbg'

[Matt Ball, 2011/03/30 17:26:55]

Could this be removed if we change the default of target to be 'dbg'?

   # Don't enable auto_reboot for people testing locally.
   auto_reboot = ActiveMaster.is_production_host
   if platform == 'win32':
     factory = m_win32[project]
     formats = ['msvs']
   elif platform == 'win64':
     factory = m_win64[project]
     formats = ['msvs']
   elif platform == 'linux':
     factory = m_linux[project]
     formats = ['scons', 'make']
   elif platform == 'mac':
     factory = m_mac[project]
     formats = ['xcode']
   elif platform == 'arm':
     factory = m_arm[project]
     formats = ['scons', 'linux']
     # Arm slaves have issue rebooting continuously.
     auto_reboot = False
-  if project == 'nacl':
+  if project in ['nacl', 'nacl-toolchain']:
     builder_factory = factory(
         slave_type='Trybot', target=target, tests=tests, options=options,
         mode=mode, compile_timeout=timeout, clobber=True,
         factory_properties=factory_properties)
   elif project == 'naclsdk':
     builder_factory = factory(
         slave_type='Trybot', target=target, tests=tests, options=options,
         mode=mode, compile_timeout=timeout, clobber=True,
         factory_properties=factory_properties, official_release=False)
   elif project == 'gyp':
@@ skipping 158 matching lines @@
       {
         'name': 'windows',
         'core_platform': 'win64',
         'builder_names': ['win64'],
         'target': 'native_client_sdk',
       },
     ],
   },
   {
     'name': 'gyp',
-    'tests': [],
     'platforms': [
       {
         'name': 'linux',
         'builder_names': ['hardy32', 'hardy64', 'lucid32', 'lucid64'],
       },
       {
         'name': 'mac',
+        'builder_names': ['mac'],
       },
       {
         'name': 'win32',
+        'builder_names': ['win32'],
       },
       {
         'name': 'win64',
+        'builder_names': ['win64'],
       },
     ],
   },
 ]
 
 for project in projects:
   for platform in project['platforms']:
     true_builder_names = platform.get('builder_names', [platform['name']])
     slave_names = [GetSlaveName(true_builder_names, x)
                    for x in range(1, number_slaves + 1)]
@@ skipping 140 matching lines @@
 
 
 ####### PROJECT IDENTITY
 
 # The 'projectURL' string will be used to provide a link
 # from buildbot HTML pages to your project's home page.
 c['projectURL'] = 'http://go/ChromeTryServer'
 
 # Buildbot master url:
 c['buildbotURL'] = 'http://build.chromium.org/p/tryserver.nacl/'