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

Side by Side Diff: build/android/buildbot/bb_device_steps.py

Issue 23444023: Remove unneeded/unrecognized --target flag from archive_layout_tests wrapper. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 3 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/usr/bin/env python 1 #!/usr/bin/env python
2 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 2 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 import collections 6 import collections
7 import glob 7 import glob
8 import hashlib 8 import hashlib
9 import multiprocessing 9 import multiprocessing
10 import os 10 import os
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 cmd_args.extend( 245 cmd_args.extend(
246 ['--additional-expectations=%s' % os.path.join(CHROME_SRC_DIR, *f)]) 246 ['--additional-expectations=%s' % os.path.join(CHROME_SRC_DIR, *f)])
247 247
248 RunCmd(['webkit/tools/layout_tests/run_webkit_tests.py'] + cmd_args) 248 RunCmd(['webkit/tools/layout_tests/run_webkit_tests.py'] + cmd_args)
249 249
250 if options.factory_properties.get('archive_webkit_results', False): 250 if options.factory_properties.get('archive_webkit_results', False):
251 bb_annotations.PrintNamedStep('archive_webkit_results') 251 bb_annotations.PrintNamedStep('archive_webkit_results')
252 RunCmd([os.path.join(SLAVE_SCRIPTS_DIR, 'chromium', 252 RunCmd([os.path.join(SLAVE_SCRIPTS_DIR, 'chromium',
253 'archive_layout_test_results.py'), 253 'archive_layout_test_results.py'),
254 '--results-dir', '../layout-test-results', 254 '--results-dir', '../layout-test-results',
255 '--target', options.target,
256 '--build-dir', CHROME_OUT_DIR, 255 '--build-dir', CHROME_OUT_DIR,
257 '--build-number', str(options.build_properties.get('buildnumber', '')), 256 '--build-number', str(options.build_properties.get('buildnumber', '')),
258 '--builder-name', options.build_properties.get('buildername', '')]) 257 '--builder-name', options.build_properties.get('buildername', '')])
259 258
260 259
261 def SpawnLogcatMonitor(): 260 def SpawnLogcatMonitor():
262 shutil.rmtree(LOGCAT_DIR, ignore_errors=True) 261 shutil.rmtree(LOGCAT_DIR, ignore_errors=True)
263 bb_utils.SpawnCmd([ 262 bb_utils.SpawnCmd([
264 os.path.join(CHROME_SRC_DIR, 'build', 'android', 'adb_logcat_monitor.py'), 263 os.path.join(CHROME_SRC_DIR, 'build', 'android', 'adb_logcat_monitor.py'),
265 LOGCAT_DIR]) 264 LOGCAT_DIR])
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
461 setattr(options, 'target', options.factory_properties.get('target', 'Debug')) 460 setattr(options, 'target', options.factory_properties.get('target', 'Debug'))
462 if options.coverage_bucket: 461 if options.coverage_bucket:
463 setattr(options, 'coverage_dir', 462 setattr(options, 'coverage_dir',
464 os.path.join(CHROME_OUT_DIR, options.target, 'coverage')) 463 os.path.join(CHROME_OUT_DIR, options.target, 'coverage'))
465 464
466 MainTestWrapper(options) 465 MainTestWrapper(options)
467 466
468 467
469 if __name__ == '__main__': 468 if __name__ == '__main__':
470 sys.exit(main(sys.argv)) 469 sys.exit(main(sys.argv))
OLDNEW
« 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