buildbot_spec: Add configuration, do_*_steps, upload_*_results, more env

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 = '''
 Write buildbot spec to outfile based on the bot name:
   $ python buildbot_spec.py outfile Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug
 Or run self-tests:
   $ python buildbot_spec.py test
 '''
 
 import inspect
 import json
 import os
 import sys
 
 import builder_name_schema
 import dm_flags
 import nanobench_flags
 
 
+CONFIG_DEBUG = 'Debug'
+CONFIG_RELEASE = 'Release'
+
+
 def lineno():
   caller = inspect.stack()[1]  # Up one level to our caller.
   return inspect.getframeinfo(caller[0]).lineno
 
 # Since we don't actually start coverage until we're in the self-test,
 # some function def lines aren't reported as covered. Add them to this
 # list so that we can ignore them.
 cov_skip = []
 
 cov_start = lineno()+1   # We care about coverage starting just past this def.
@@ skipping 106 matching lines @@
   # skia_use_android_framework_defines.
   if builder_dict.get('extra_config') == 'Android_FrameworkDefs':
     gyp_defs['skia_use_android_framework_defines'] = '1'
 
   return gyp_defs
 
 
 cov_skip.extend([lineno(), lineno() + 1])
 def get_extra_env_vars(builder_dict):
   env = {}
-  if builder_dict.get('compiler') == 'Clang':
+  if builder_dict.get('configuration') == 'Coverage':
+    # We have to use Clang 3.6 because earlier versions do not support the
+    # compile flags we use and 3.7 and 3.8 hit asserts during compilation.
+    env['CC'] = '/usr/bin/clang-3.6'
+    env['CXX'] = '/usr/bin/clang++-3.6'
+  elif builder_dict.get('compiler') == 'Clang':
     env['CC'] = '/usr/bin/clang'
     env['CXX'] = '/usr/bin/clang++'
   return env
 
 
 cov_skip.extend([lineno(), lineno() + 1])
 def build_targets_from_builder_dict(builder_dict):
   """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']
@@ skipping 61 matching lines @@
   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)
+
+  # 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',
+    'Coverage',
+    'TSAN',
+    'UBSAN',
+    'Valgrind',
+  ]
+  upload_dm_results = True
+  for s in skip_upload_bots:
+    if s in builder_name:
+      upload_dm_results = False
+      break
+  rv['upload_dm_results'] = upload_dm_results
+
   return rv
 
 
 cov_end = lineno()   # Don't care about code coverage past here.
 
 
 def self_test():
   import coverage  # This way the bots don't need coverage.py to be installed.
   args = {}
   cases = [
@@ skipping 42 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)