Fix build targets for some bots

tools/buildbot_spec.py

 #
 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
 
 #!/usr/bin/env python
 
 usage = '''
@@ skipping 153 matching lines @@
 
   # SKNX_NO_SIMD, SK_USE_DISCARDABLE_SCALEDIMAGECACHE, etc.
   extra_config = builder_dict.get('extra_config', '')
   if extra_config.startswith('SK') and extra_config.isupper():
     env['CPPFLAGS'] = '-D' + extra_config
 
   return env
 
 
 cov_skip.extend([lineno(), lineno() + 1])
-def build_targets_from_builder_dict(builder_dict):
+def build_targets_from_builder_dict(builder_dict, do_test_steps, do_perf_steps):
   """Return a list of targets to build, depending on the builder type."""
   if builder_dict['role'] in ('Test', 'Perf') and builder_dict['os'] == 'iOS':
     return ['iOSShell']
-  elif builder_dict['role'] == builder_name_schema.BUILDER_ROLE_TEST:
-    t = ['dm']
-    if builder_dict.get('configuration') == 'Debug':
-      t.append('nanobench')
+  if builder_dict.get('extra_config') == 'Appurify':
+    return ['VisualBenchTest_APK']
+  t = []
+  if do_test_steps:
+    t.append('dm')
+  if do_perf_steps:
+    t.append('nanobench')
+  if t:
     return t
-  elif builder_dict['role'] == builder_name_schema.BUILDER_ROLE_PERF:
-    if builder_dict.get('extra_config') == 'Appurify':
-      return ['VisualBenchTest_APK']
-    else:
-      return ['nanobench']
   else:
     return ['most']
 
 
 cov_skip.extend([lineno(), lineno() + 1])
 def device_cfg(builder_dict):
   # Android.
   if 'Android' in builder_dict.get('extra_config', ''):
     if 'NoNeon' in builder_dict['extra_config']:
       return 'arm_v7'
@@ skipping 35 matching lines @@
 
 cov_skip.extend([lineno(), lineno() + 1])
 def get_builder_spec(builder_name):
   builder_dict = builder_name_schema.DictForBuilderName(builder_name)
   env = get_extra_env_vars(builder_dict)
   gyp_defs = gyp_defines(builder_dict)
   gyp_defs_list = ['%s=%s' % (k, v) for k, v in gyp_defs.iteritems()]
   gyp_defs_list.sort()
   env['GYP_DEFINES'] = ' '.join(gyp_defs_list)
   rv = {
-    'build_targets': build_targets_from_builder_dict(builder_dict),
     'builder_cfg': builder_dict,
     'dm_flags': dm_flags.get_args(builder_name),
     'env': env,
     'nanobench_flags': nanobench_flags.get_args(builder_name),
   }
   device = device_cfg(builder_dict)
   if device:
     rv['device_cfg'] = device
 
   role = builder_dict['role']
   if role == builder_name_schema.BUILDER_ROLE_HOUSEKEEPER:
     configuration = CONFIG_RELEASE
   else:
     configuration = builder_dict.get(
         'configuration', CONFIG_DEBUG)
   arch = (builder_dict.get('arch') or builder_dict.get('target_arch'))
   if ('Win' in builder_dict.get('os', '') and arch == 'x86_64'):
     configuration += '_x64'
   rv['configuration'] = configuration
   rv['do_test_steps'] = role == builder_name_schema.BUILDER_ROLE_TEST
   rv['do_perf_steps'] = (role == builder_name_schema.BUILDER_ROLE_PERF or
                          (role == builder_name_schema.BUILDER_ROLE_TEST and
                           configuration == CONFIG_DEBUG) or
                          'Valgrind' in builder_name)
+  rv['build_targets'] = build_targets_from_builder_dict(
+        builder_dict, rv['do_test_steps'], rv['do_perf_steps'])
 
   # Do we upload perf results?
   upload_perf_results = False
   if role == builder_name_schema.BUILDER_ROLE_PERF:
     upload_perf_results = True
   rv['upload_perf_results'] = upload_perf_results
 
   # Do we upload correctness results?
   skip_upload_bots = [
     'ASAN',
@@ skipping 69 matching lines @@
   if len(sys.argv) == 2 and sys.argv[1] == 'test':
     self_test()
     sys.exit(0)
 
   if len(sys.argv) != 3:
     print usage
     sys.exit(1)
 
   with open(sys.argv[1], 'w') as out:
     json.dump(get_builder_spec(sys.argv[2]), out)