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

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

Issue 761343003: Add recipe support for merged chromium-blink repo FYI bots (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 6 years 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 re 5 import re
6 6
7 7
8 class Test(object): 8 class Test(object):
9 """ 9 """
10 Base class for tests that can be retried after deapplying a previously 10 Base class for tests that can be retried after deapplying a previously
(...skipping 938 matching lines...) Expand 10 before | Expand all | Expand 10 after
949 def compile_targets(self, _): 949 def compile_targets(self, _):
950 return [self.compile_target] 950 return [self.compile_target]
951 951
952 952
953 class BlinkTest(Test): 953 class BlinkTest(Test):
954 # TODO(dpranke): This should be converted to a PythonBasedTest, although it 954 # TODO(dpranke): This should be converted to a PythonBasedTest, although it
955 # will need custom behavior because we archive the results as well. 955 # will need custom behavior because we archive the results as well.
956 956
957 name = 'webkit_tests' 957 name = 'webkit_tests'
958 958
959 def __init__(self, api): 959 @staticmethod
960 super(BlinkTest, self).__init__() 960 def compile_targets(api):
961 self.results_dir = api.path['slave_build'].join('layout-test-results') 961 return []
962 self.layout_test_wrapper = api.path['build'].join(
963 'scripts', 'slave', 'chromium', 'layout_test_wrapper.py')
964 962
965 def run(self, api, suffix): 963 def run(self, api, suffix):
964 results_dir = api.path['slave_build'].join('layout-test-results')
965
966 args = ['--target', api.chromium.c.BUILD_CONFIG, 966 args = ['--target', api.chromium.c.BUILD_CONFIG,
967 '-o', self.results_dir, 967 '-o', results_dir,
968 '--build-dir', api.chromium.c.build_dir, 968 '--build-dir', api.chromium.c.build_dir,
969 '--json-test-results', api.json.test_results(add_json_log=False)] 969 '--json-test-results', api.json.test_results(add_json_log=False)]
970 if suffix == 'without patch': 970 if suffix == 'without patch':
971 test_list = "\n".join(self.failures(api, 'with patch')) 971 test_list = "\n".join(self.failures(api, 'with patch'))
972 args.extend(['--test-list', api.raw_io.input(test_list), 972 args.extend(['--test-list', api.raw_io.input(test_list),
973 '--skipped', 'always']) 973 '--skipped', 'always'])
974 974
975 if 'oilpan' in api.properties['buildername']: 975 if 'oilpan' in api.properties['buildername']:
976 args.extend(['--additional-expectations', 976 args.extend(['--additional-expectations',
977 api.path['checkout'].join('third_party', 'WebKit', 977 api.path['checkout'].join('third_party', 'WebKit',
978 'LayoutTests', 978 'LayoutTests',
979 'OilpanExpectations')]) 979 'OilpanExpectations')])
980 980
981 try: 981 try:
982 step_result = api.chromium.runtest(self.layout_test_wrapper, 982 step_result = api.chromium.runtest(
983 args, name=self._step_name(suffix)) 983 api.path['build'].join('scripts', 'slave', 'chromium',
984 'layout_test_wrapper.py'),
985 args, name=self._step_name(suffix),
986 step_test_data=lambda: api.json.test_api.canned_test_output(
987 passing=True, minimal=True))
984 except api.step.StepFailure as f: 988 except api.step.StepFailure as f:
985 step_result = f.result 989 step_result = f.result
986 990
987 self._test_runs[suffix] = step_result 991 self._test_runs[suffix] = step_result
988 992
989 if step_result: 993 if step_result:
990 r = step_result.json.test_results 994 r = step_result.json.test_results
991 p = step_result.presentation 995 p = step_result.presentation
992 996
993 p.step_text += api.test_utils.format_step_text([ 997 p.step_text += api.test_utils.format_step_text([
(...skipping 11 matching lines...) Expand all
1005 buildername = api.properties['buildername'] 1009 buildername = api.properties['buildername']
1006 buildnumber = api.properties['buildnumber'] 1010 buildnumber = api.properties['buildnumber']
1007 1011
1008 archive_layout_test_results = api.path['build'].join( 1012 archive_layout_test_results = api.path['build'].join(
1009 'scripts', 'slave', 'chromium', 'archive_layout_test_results.py') 1013 'scripts', 'slave', 'chromium', 'archive_layout_test_results.py')
1010 1014
1011 archive_result = api.python( 1015 archive_result = api.python(
1012 'archive_webkit_tests_results', 1016 'archive_webkit_tests_results',
1013 archive_layout_test_results, 1017 archive_layout_test_results,
1014 [ 1018 [
1015 '--results-dir', self.results_dir, 1019 '--results-dir', results_dir,
1016 '--build-dir', api.chromium.c.build_dir, 1020 '--build-dir', api.chromium.c.build_dir,
1017 '--build-number', buildnumber, 1021 '--build-number', buildnumber,
1018 '--builder-name', buildername, 1022 '--builder-name', buildername,
1019 '--gs-bucket', 'gs://chromium-layout-test-archives', 1023 '--gs-bucket', 'gs://chromium-layout-test-archives',
1020 ] + api.json.property_args(), 1024 ] + api.json.property_args(),
1021 ) 1025 )
1022 1026
1023 # TODO(infra): http://crbug.com/418946 . 1027 # TODO(infra): http://crbug.com/418946 .
1024 sanitized_buildername = re.sub('[ .()]', '_', buildername) 1028 sanitized_buildername = re.sub('[ .()]', '_', buildername)
1025 base = ( 1029 base = (
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
1104 GTestTest('crypto_unittests'), 1108 GTestTest('crypto_unittests'),
1105 GTestTest('gfx_unittests'), 1109 GTestTest('gfx_unittests'),
1106 GTestTest('url_unittests'), 1110 GTestTest('url_unittests'),
1107 GTestTest('content_unittests'), 1111 GTestTest('content_unittests'),
1108 GTestTest('net_unittests'), 1112 GTestTest('net_unittests'),
1109 GTestTest('ui_base_unittests'), 1113 GTestTest('ui_base_unittests'),
1110 GTestTest('ui_ios_unittests'), 1114 GTestTest('ui_ios_unittests'),
1111 GTestTest('sync_unit_tests'), 1115 GTestTest('sync_unit_tests'),
1112 GTestTest('sql_unittests'), 1116 GTestTest('sql_unittests'),
1113 ] 1117 ]
OLDNEW
« no previous file with comments | « scripts/slave/recipe_modules/chromium/chromium_fyi.py ('k') | scripts/slave/recipe_modules/chromium_tests/api.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698