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

Side by Side Diff: scripts/slave/recipe_modules/chromium_tests/steps.py

Issue 2420543002: Use passed-in --build-dir instead of GetBuildOutputDirectory in archive_layout_test_results.py. (Closed)
Patch Set: Use the passed-in build-dir Created 4 years, 2 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
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 import datetime 5 import datetime
6 import json 6 import json
7 import re 7 import re
8 import string 8 import string
9 9
10 10
(...skipping 1683 matching lines...) Expand 10 before | Expand all | Expand 10 after
1694 ]) 1694 ])
1695 1695
1696 if suffix in ('', 'with patch'): 1696 if suffix in ('', 'with patch'):
1697 buildername = api.properties['buildername'] 1697 buildername = api.properties['buildername']
1698 buildnumber = api.properties['buildnumber'] 1698 buildnumber = api.properties['buildnumber']
1699 1699
1700 archive_layout_test_results = api.chromium.package_repo_resource( 1700 archive_layout_test_results = api.chromium.package_repo_resource(
1701 'scripts', 'slave', 'chromium', 'archive_layout_test_results.py') 1701 'scripts', 'slave', 'chromium', 'archive_layout_test_results.py')
1702 1702
1703 archive_layout_test_args = [ 1703 archive_layout_test_args = [
1704 '--build-dir', api.chromium.c.build_dir,
Dirk Pranke 2016/10/13 23:34:43 Are you changing this to sort the parameters? If s
qyearsley 2016/10/13 23:48:05 Yeah, that sounds good :-)
1704 '--results-dir', results_dir, 1705 '--results-dir', results_dir,
1705 '--build-dir', api.chromium.c.build_dir,
1706 '--build-number', buildnumber, 1706 '--build-number', buildnumber,
1707 '--builder-name', buildername, 1707 '--builder-name', buildername,
1708 '--gs-bucket', 'gs://chromium-layout-test-archives', 1708 '--gs-bucket', 'gs://chromium-layout-test-archives',
1709 '--staging-dir', api.path['cache'].join('chrome_staging'), 1709 '--staging-dir', api.path['cache'].join('chrome_staging'),
1710 ] 1710 ]
1711 # TODO(phajdan.jr): Pass gs_acl as a parameter, not build property. 1711 # TODO(phajdan.jr): Pass gs_acl as a parameter, not build property.
1712 if api.properties.get('gs_acl'): 1712 if api.properties.get('gs_acl'):
1713 archive_layout_test_args.extend(['--gs-acl', api.properties['gs_acl']] ) 1713 archive_layout_test_args.extend(['--gs-acl', api.properties['gs_acl']] )
1714 archive_result = api.python( 1714 archive_result = api.python(
1715 'archive_webkit_tests_results', 1715 'archive_webkit_tests_results',
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
1851 args=args) 1851 args=args)
1852 api.gsutil.upload( 1852 api.gsutil.upload(
1853 temp_output_dir.join( 1853 temp_output_dir.join(
1854 '%s-android-chrome.json' % timestamp_string), 1854 '%s-android-chrome.json' % timestamp_string),
1855 'chromium-annotated-tests', 'android') 1855 'chromium-annotated-tests', 'android')
1856 1856
1857 GOMA_TESTS = [ 1857 GOMA_TESTS = [
1858 GTestTest('base_unittests'), 1858 GTestTest('base_unittests'),
1859 GTestTest('content_unittests'), 1859 GTestTest('content_unittests'),
1860 ] 1860 ]
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698