Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(45)

Unified Diff: masters/master.tryserver.nacl/master.cfg

Issue 1181213003: Pass 'src' explicitly to non-nacl (naclports builds). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: fix Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: masters/master.tryserver.nacl/master.cfg
diff --git a/masters/master.tryserver.nacl/master.cfg b/masters/master.tryserver.nacl/master.cfg
index 75d1f4e979bd0f4ff321de916905b7d96459fb24..f348be596c22fe882d06ba6acc0b52bbbb284aa8 100644
--- a/masters/master.tryserver.nacl/master.cfg
+++ b/masters/master.tryserver.nacl/master.cfg
@@ -633,19 +633,12 @@ b_naclports_presubmit = {
}
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)
-
nodir 2015/06/12 17:11:12 Can't review this part
# Set "root" build property to "native_client" in all nacl-* builders.
Sam Clegg 2015/06/12 16:55:46 Update the comment.
bradn 2015/06/12 17:05:08 Done.
for b in c['builders']:
if b['name'].startswith('nacl-'):
b.setdefault('properties', {})['root'] = 'native_client'
+ else:
+ b.setdefault('properties', {})['root'] = 'src'
Sam Clegg 2015/06/12 16:55:46 How does this work on other waterfalls?
bradn 2015/06/12 17:05:08 Unclear, my impression is that for many others a r
nodir 2015/06/12 17:11:12 this part lgtm
nodir 2015/06/12 17:11:12 Other waterfalls use recipes. Recipes simply do no
####### BUILDSLAVES
@@ -664,7 +657,6 @@ 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(
@@ -688,12 +680,6 @@ if LISTEN_TO_RIETVELD:
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,
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698