Pass 'src' explicitly to non-nacl (naclports builds).

masters/master.tryserver.nacl/master.cfg

 # -*- python -*-
 # ex: set syntax=python:
 
 # 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.
 
 # READ THIS:
 # See http://dev.chromium.org/developers/testing/chromium-build-infrastructure
 
@@ skipping 615 matching lines @@
 
 b_naclports_presubmit = {
   'name': 'naclports-presubmit',
   'slavebuilddir': 'naclports',
   'factory':
       m_annotator.BaseFactory('run_presubmit', {'repo_name': 'naclports'}),
   'slavenames': GetSlaveNames(['precise64'])
 }
 c['builders'].append(b_naclports_presubmit)
 
-b_gyp_presubmit = {
-  'name': 'gyp-presubmit',
-  'slavebuilddir': 'gyp',
-  'factory':
-      m_annotator.BaseFactory('run_presubmit', {'repo_name': 'gyp'}),
-  'slavenames': GetSlaveNames(['precise64'])
-}
-c['builders'].append(b_gyp_presubmit)
-
-# Set "root" build property to "native_client" in all nacl-* builders.
+# Set "root" build property to "native_client" in all nacl-* builders,
+# set it to "src" on all others.
 for b in c['builders']:
   if b['name'].startswith('nacl-'):
     b.setdefault('properties', {})['root'] = 'native_client'
+  else:
+    b.setdefault('properties', {})['root'] = 'src'
 
 ####### BUILDSLAVES
 
 # The 'slaves' list defines the set of allowable buildslaves. List all the
 # slaves registered to a builder. Remove dupes.
 c['slaves'] = master_utils.AutoSetupSlaves(c['builders'],
                                            config.Master.GetBotPassword())
 
 
 ####### SCHEDULERS
 
 # Configure the Schedulers;
 # Main Tryscheduler for the try queue. groups is defined in the loop above.
 c['schedulers'] = []
 
 code_review_sites = {
   'nacl': ActiveMaster.code_review_site,
   'nacl-toolchain': ActiveMaster.code_review_site,
-  'gyp': ActiveMaster.code_review_site,
   'naclports': ActiveMaster.code_review_site,
 }
 c['schedulers'].append(TryJobHTTP(
     name='try_job_http',
     port=ActiveMaster.try_job_port,
     code_review_sites=code_review_sites,
     pools=pools))
 
 if ActiveMaster.svn_url:
   c['schedulers'].append(TryJobSubversion(
       name='try_job_svn',
       svn_url=ActiveMaster.svn_url,
       code_review_sites=code_review_sites,
       pools=pools))
 
 if LISTEN_TO_RIETVELD:
   c['schedulers'].append(TryJobRietveld(
         name='try_job_rietveld_nacl',
         pools=pools,
         code_review_sites=code_review_sites,
         project='nacl',
         filter_master=True))
   c['schedulers'].append(TryJobRietveld(
-        name='try_job_rietveld_gyp',
-        pools=pools,
-        code_review_sites=code_review_sites,
-        project='gyp',
-        filter_master=True))
-  c['schedulers'].append(TryJobRietveld(
         name='try_job_rietveld_naclports',
         pools=pools,
         code_review_sites=code_review_sites,
         project='naclports',
         filter_master=True))
 
 for mode in ['opt_panda', 'perf_panda']:
   s = Triggerable(
       name='arm_%s_hw_tests' % mode,
       builderNames=['nacl-arm_hw_%s' % mode])
@@ skipping 47 matching lines @@
 c['eventHorizon'] = 100
 # Must be at least 2x the number of on-going builds.
 c['buildCacheSize'] = 100
 
 
 ####### 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'