Add sizes test to chromium.perf builders.

scripts/slave/recipe_modules/chromium_tests/chromium_perf.py

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import collections
 
 from . import steps
 
 
 _builders = collections.defaultdict(dict)
 
 
 SPEC = {
   'builders': {},
   'settings': {
     'build_gs_bucket': 'chrome-perf',
   },
 }
 
 
 def _BaseSpec(bot_type, chromium_apply_config, disable_tests,
-              gclient_config, platform, target_bits):
+              gclient_config, platform, target_bits, tests):
   return {
     'bot_type': bot_type,
     'chromium_apply_config' : chromium_apply_config,
     'chromium_config': 'chromium_official',
     'chromium_config_kwargs': {
       'BUILD_CONFIG': 'Release',
       'TARGET_BITS': target_bits,
     },
     'disable_tests': disable_tests,
     'gclient_config': gclient_config,
     'testing': {
       'platform': 'linux' if platform == 'android' else platform,
     },
+    'tests': tests,
   }
 
 
 def _BuildSpec(platform, target_bits):
+  if target_bits == 64:
+    perf_id = platform
+  else:
+    perf_id = '%s-%d' % (platform, target_bits)
+
   spec = _BaseSpec(
       bot_type='builder',
       chromium_apply_config=['mb', 'chromium_perf', 'goma_hermetic_fallback'],
       disable_tests=True,
       gclient_config='chromium',
       platform=platform,
-      target_bits=target_bits)
+      target_bits=target_bits,
+      tests=[steps.SizesStep('https://chromeperf.appspot.com', perf_id)])
 
   if platform == 'android':
     spec['chromium_apply_config'].append('android')
     spec['chromium_config_kwargs']['TARGET_ARCH'] = 'arm'
     spec['gclient_apply_config'] = ['android', 'perf']
   else:
     spec['compile_targets'] = ['chromium_builder_perf']
     spec['gclient_apply_config'] = ['chrome_internal']
 
-  if platform == 'win':
-    spec['tests'] = { steps.SizesStep(results_url=None, perf_id=None) }
-
   return spec
 
 
 def _TestSpec(parent_builder, perf_id, platform, target_bits, max_battery_temp,
               shard_index, num_host_shards, num_device_shards,
               known_devices_file):
   spec = _BaseSpec(
       bot_type='tester',
       chromium_apply_config=[],
       disable_tests=platform == 'android',
       gclient_config='perf',
       platform=platform,
-      target_bits=target_bits)
+      target_bits=target_bits,
+      tests=[steps.DynamicPerfTests(
+        perf_id, platform, target_bits, max_battery_temp, num_device_shards,
+        num_host_shards, shard_index, known_devices_file)
+      ])
 
   spec['parent_buildername'] = parent_builder
-  spec['perf-id'] = perf_id
-  spec['results-url'] = 'https://chromeperf.appspot.com'
-  spec['tests'] = [
-    steps.DynamicPerfTests(perf_id, platform, target_bits, max_battery_temp,
-                           num_device_shards, num_host_shards, shard_index,
-                           known_devices_file),
-  ]
 
   if platform == 'android':
     spec['android_config'] = 'perf'
     spec['chromium_config_kwargs']['TARGET_PLATFORM'] = 'android'
     spec['gclient_apply_config'] = ['android']
   else:
     spec['test_generators'] = [steps.generate_script]
     spec['test_spec_file'] = 'chromium.perf.json'
 
   return spec
@@ skipping 65 matching lines @@
 _AddTestSpec('Mac 10.10 Perf', 'chromium-rel-mac10', 'mac',
              num_host_shards=5)
 _AddTestSpec('Mac Retina Perf', 'chromium-rel-mac-retina', 'mac',
              num_host_shards=5)
 _AddTestSpec('Mac HDD Perf', 'chromium-rel-mac-hdd', 'mac',
              num_host_shards=5)
 
 
 _AddTestSpec('Linux Perf', 'linux-release', 'linux',
              num_host_shards=5)