Add VisualBench switch to extra_config

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 125 matching lines @@
   # Link-time code generation just wastes time on compile-only bots.
   if (builder_dict.get('role') == builder_name_schema.BUILDER_ROLE_BUILD and
       builder_dict.get('compiler') == 'MSVC'):
     gyp_defs['skia_win_ltcg'] = '0'
 
   # Mesa.
   if (builder_dict.get('extra_config') == 'Mesa' or
       builder_dict.get('cpu_or_gpu_value') == 'Mesa'):
     gyp_defs['skia_mesa'] = '1'
 
+  # VisualBench
+  if builder_dict.get('extra_config') == 'VisualBench':
+    gyp_defs['skia_use_sdl'] = '1'
+
   # skia_use_android_framework_defines.
   if builder_dict.get('extra_config') == 'Android_FrameworkDefs':
     gyp_defs['skia_use_android_framework_defines'] = '1'
 
   # Skia dump stats for perf tests and gpu
   if (builder_dict.get('cpu_or_gpu') == 'GPU' and
       builder_dict.get('role') == 'Perf'):
       gyp_defs['skia_dump_stats'] = '1'
 
   return gyp_defs
@@ skipping 22 matching lines @@
 cov_skip.extend([lineno(), lineno() + 1])
 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']
   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 do_perf_steps and builder_dict.get('extra_config') == 'VisualBench':
+      t.append('visualbench')
+  elif do_perf_steps:
+      t.append('nanobench')
   if t:
     return t
   else:
     return ['most']
 
 
 cov_skip.extend([lineno(), lineno() + 1])
 def device_cfg(builder_dict):
   # Android.
   if 'Android' in builder_dict.get('extra_config', ''):
@@ skipping 112 matching lines @@
         'Build-Win-MSVC-x86-Debug-GDI',
         'Build-Win-MSVC-x86-Debug-Exceptions',
         'Build-Ubuntu-GCC-Arm7-Debug-Android_FrameworkDefs',
         'Build-Ubuntu-GCC-Arm7-Debug-Android_NoNeon',
         'Build-Ubuntu-GCC-Arm7-Debug-CrOS_Daisy',
         'Build-Ubuntu-GCC-x86_64-Debug-CrOS_Link',
         'Build-Ubuntu-GCC-x86_64-Release-Mesa',
         'Build-Ubuntu-GCC-x86_64-Release-ANGLE',
         'Housekeeper-PerCommit',
         'Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release-Trybot',
+        'Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release-VisualBench',
         'Test-Android-GCC-GalaxyS4-GPU-SGX544-Arm7-Debug',
         'Perf-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Release-Appurify',
         'Test-Android-GCC-Nexus6-GPU-Adreno420-Arm7-Debug',
         'Test-ChromeOS-GCC-Link-CPU-AVX-x86_64-Debug',
         'Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug',
         'Test-Mac10.8-Clang-MacMini4.1-GPU-GeForce320M-x86_64-Release',
         'Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage',
         ('Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-'
          'SK_USE_DISCARDABLE_SCALEDIMAGECACHE'),
         'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-SKNX_NO_SIMD',
@@ skipping 26 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)