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

Side by Side Diff: scripts/master/factory/chromium_commands.py

Issue 12927002: use additional_expectations as a command parameter (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Created 7 years, 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 """Set of utilities to add commands to a buildbot factory. 5 """Set of utilities to add commands to a buildbot factory.
6 6
7 This is based on commands.py and adds chromium-specific commands.""" 7 This is based on commands.py and adds chromium-specific commands."""
8 8
9 import logging 9 import logging
10 import os 10 import os
(...skipping 1051 matching lines...) Expand 10 before | Expand all | Expand 10 after
1062 pageheap_description = ' (--enable-pageheap)' 1062 pageheap_description = ' (--enable-pageheap)'
1063 1063
1064 webkit_result_dir = '/'.join(['..', '..', 'layout-test-results']) 1064 webkit_result_dir = '/'.join(['..', '..', 'layout-test-results'])
1065 1065
1066 cmd_args = ['--target', self._target, 1066 cmd_args = ['--target', self._target,
1067 '-o', webkit_result_dir, 1067 '-o', webkit_result_dir,
1068 '--build-dir', self._build_dir, 1068 '--build-dir', self._build_dir,
1069 '--build-number', WithProperties('%(buildnumber)s'), 1069 '--build-number', WithProperties('%(buildnumber)s'),
1070 '--builder-name', WithProperties(builder_name)] 1070 '--builder-name', WithProperties(builder_name)]
1071 1071
1072 for comps in factory_properties.get('additional_expectations_files', []): 1072 for comps in factory_properties.get('additional_expectations', []):
1073 cmd_args.append('--additional-expectations-file') 1073 cmd_args.append('--additional-expectations')
1074 cmd_args.append(self.PathJoin('src', *comps)) 1074 cmd_args.append(self.PathJoin('src', *comps))
1075 1075
1076 if layout_part: 1076 if layout_part:
1077 cmd_args.extend(['--run-part', layout_part]) 1077 cmd_args.extend(['--run-part', layout_part])
1078 1078
1079 if with_pageheap: 1079 if with_pageheap:
1080 cmd_args.append('--enable-pageheap') 1080 cmd_args.append('--enable-pageheap')
1081 1081
1082 if test_results_server: 1082 if test_results_server:
1083 cmd_args.extend(['--test-results-server', test_results_server]) 1083 cmd_args.extend(['--test-results-server', test_results_server])
(...skipping 490 matching lines...) Expand 10 before | Expand all | Expand 10 after
1574 return '%s/%s/%s' % (config.Master.archive_url, archive_type, builder_name) 1574 return '%s/%s/%s' % (config.Master.archive_url, archive_type, builder_name)
1575 1575
1576 1576
1577 def _GetSnapshotUrl(factory_properties=None, builder_name='%(build_name)s'): 1577 def _GetSnapshotUrl(factory_properties=None, builder_name='%(build_name)s'):
1578 if not factory_properties or 'gs_bucket' not in factory_properties: 1578 if not factory_properties or 'gs_bucket' not in factory_properties:
1579 return (_GetArchiveUrl('snapshots', builder_name), None) 1579 return (_GetArchiveUrl('snapshots', builder_name), None)
1580 gs_bucket = factory_properties['gs_bucket'] 1580 gs_bucket = factory_properties['gs_bucket']
1581 gs_bucket = re.sub(r'^gs://', 'http://commondatastorage.googleapis.com/', 1581 gs_bucket = re.sub(r'^gs://', 'http://commondatastorage.googleapis.com/',
1582 gs_bucket) 1582 gs_bucket)
1583 return ('%s/index.html?path=%s' % (gs_bucket, builder_name), '/') 1583 return ('%s/index.html?path=%s' % (gs_bucket, builder_name), '/')
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698