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

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

Issue 2131993003: android: use common known_devices_file path from chromium_android (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 4 years, 5 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
« no previous file with comments | « no previous file | scripts/slave/recipe_modules/chromium_tests/steps.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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 collections 5 import collections
6 6
7 from . import steps 7 from . import steps
8 8
9 9
10 _builders = collections.defaultdict(dict) 10 _builders = collections.defaultdict(dict)
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 spec['chromium_config_kwargs']['TARGET_ARCH'] = 'arm' 62 spec['chromium_config_kwargs']['TARGET_ARCH'] = 'arm'
63 spec['gclient_apply_config'] = ['android', 'perf'] 63 spec['gclient_apply_config'] = ['android', 'perf']
64 else: 64 else:
65 spec['compile_targets'] = ['chromium_builder_perf'] 65 spec['compile_targets'] = ['chromium_builder_perf']
66 spec['gclient_apply_config'] = ['chrome_internal'] 66 spec['gclient_apply_config'] = ['chrome_internal']
67 67
68 return spec 68 return spec
69 69
70 70
71 def _TestSpec(parent_builder, perf_id, platform, target_bits, max_battery_temp, 71 def _TestSpec(parent_builder, perf_id, platform, target_bits, max_battery_temp,
72 shard_index, num_host_shards, num_device_shards, 72 shard_index, num_host_shards, num_device_shards):
73 known_devices_file):
74 spec = _BaseSpec( 73 spec = _BaseSpec(
75 bot_type='tester', 74 bot_type='tester',
76 chromium_apply_config=['chromium_perf'], 75 chromium_apply_config=['chromium_perf'],
77 disable_tests=platform == 'android', 76 disable_tests=platform == 'android',
78 gclient_config='perf', 77 gclient_config='perf',
79 platform=platform, 78 platform=platform,
80 target_bits=target_bits, 79 target_bits=target_bits,
81 tests=[steps.DynamicPerfTests( 80 tests=[steps.DynamicPerfTests(
82 perf_id, platform, target_bits, max_battery_temp=max_battery_temp, 81 perf_id, platform, target_bits, max_battery_temp=max_battery_temp,
83 num_device_shards=num_device_shards, num_host_shards=num_host_shards, 82 num_device_shards=num_device_shards, num_host_shards=num_host_shards,
84 shard_index=shard_index, known_devices_file=known_devices_file)], 83 shard_index=shard_index)],
85 ) 84 )
86 85
87 spec['parent_buildername'] = parent_builder 86 spec['parent_buildername'] = parent_builder
88 spec['perf-id'] = perf_id 87 spec['perf-id'] = perf_id
89 spec['results-url'] = 'https://chromeperf.appspot.com' 88 spec['results-url'] = 'https://chromeperf.appspot.com'
90 89
91 if platform == 'android': 90 if platform == 'android':
92 spec['android_config'] = 'perf' 91 spec['android_config'] = 'perf'
93 spec['chromium_config_kwargs']['TARGET_PLATFORM'] = 'android' 92 spec['chromium_config_kwargs']['TARGET_PLATFORM'] = 'android'
94 spec['gclient_apply_config'] = ['android'] 93 spec['gclient_apply_config'] = ['android']
95 else: 94 else:
96 spec['test_generators'] = [steps.generate_script] 95 spec['test_generators'] = [steps.generate_script]
97 spec['test_spec_file'] = 'chromium.perf.json' 96 spec['test_spec_file'] = 'chromium.perf.json'
98 97
99 return spec 98 return spec
100 99
101 100
102 def _AddBuildSpec(name, platform, target_bits=64): 101 def _AddBuildSpec(name, platform, target_bits=64):
103 SPEC['builders'][name] = _BuildSpec(platform, target_bits) 102 SPEC['builders'][name] = _BuildSpec(platform, target_bits)
104 assert target_bits not in _builders[platform] 103 assert target_bits not in _builders[platform]
105 _builders[platform][target_bits] = name 104 _builders[platform][target_bits] = name
106 105
107 106
108 def _AddTestSpec(name, perf_id, platform, target_bits=64, 107 def _AddTestSpec(name, perf_id, platform, target_bits=64,
109 max_battery_temp=350, num_host_shards=1, num_device_shards=1, 108 max_battery_temp=350, num_host_shards=1, num_device_shards=1):
110 known_devices_file='.known_devices'):
111 parent_builder = _builders[platform][target_bits] 109 parent_builder = _builders[platform][target_bits]
112 for shard_index in xrange(num_host_shards): 110 for shard_index in xrange(num_host_shards):
113 builder_name = '%s (%d)' % (name, shard_index + 1) 111 builder_name = '%s (%d)' % (name, shard_index + 1)
114 SPEC['builders'][builder_name] = _TestSpec( 112 SPEC['builders'][builder_name] = _TestSpec(
115 parent_builder, perf_id, platform, target_bits, max_battery_temp, 113 parent_builder, perf_id, platform, target_bits, max_battery_temp,
116 shard_index, num_host_shards, num_device_shards, known_devices_file) 114 shard_index, num_host_shards, num_device_shards)
117 115
118 116
119 _AddBuildSpec('Android Builder', 'android', target_bits=32) 117 _AddBuildSpec('Android Builder', 'android', target_bits=32)
120 _AddBuildSpec('Android arm64 Builder', 'android') 118 _AddBuildSpec('Android arm64 Builder', 'android')
121 _AddBuildSpec('Win Builder', 'win', target_bits=32) 119 _AddBuildSpec('Win Builder', 'win', target_bits=32)
122 _AddBuildSpec('Win x64 Builder', 'win') 120 _AddBuildSpec('Win x64 Builder', 'win')
123 _AddBuildSpec('Mac Builder', 'mac') 121 _AddBuildSpec('Mac Builder', 'mac')
124 _AddBuildSpec('Linux Builder', 'linux') 122 _AddBuildSpec('Linux Builder', 'linux')
125 123
126 124
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 _AddTestSpec('Mac 10.10 Perf', 'chromium-rel-mac10', 'mac', 163 _AddTestSpec('Mac 10.10 Perf', 'chromium-rel-mac10', 'mac',
166 num_host_shards=5) 164 num_host_shards=5)
167 _AddTestSpec('Mac Retina Perf', 'chromium-rel-mac-retina', 'mac', 165 _AddTestSpec('Mac Retina Perf', 'chromium-rel-mac-retina', 'mac',
168 num_host_shards=5) 166 num_host_shards=5)
169 _AddTestSpec('Mac HDD Perf', 'chromium-rel-mac-hdd', 'mac', 167 _AddTestSpec('Mac HDD Perf', 'chromium-rel-mac-hdd', 'mac',
170 num_host_shards=5) 168 num_host_shards=5)
171 169
172 170
173 _AddTestSpec('Linux Perf', 'linux-release', 'linux', 171 _AddTestSpec('Linux Perf', 'linux-release', 'linux',
174 num_host_shards=5) 172 num_host_shards=5)
OLDNEW
« no previous file with comments | « no previous file | scripts/slave/recipe_modules/chromium_tests/steps.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698