Make GPU FYI Clang builder mirror the main.

tools/mb/mb_config.pyl

 # 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.
 
 {
   # This is a map of buildbot master names -> buildbot builder names ->
   # config names (where each config name is a key in the 'configs' dict,
   # below). MB uses this dict to look up which config to use for a given bot.
   'masters': {
     # Take care when changing any of these builders to ensure that you do not
@@ skipping 242 matching lines @@
       'Android Debug (Nexus 6)': 'android_gn_debug_static_trybot',
       'Android Debug (Nexus 9)': 'android_gn_debug_static_trybot_arm64',
       'GPU Linux Builder (dbg)': 'swarming_gpu_fyi_tests_gn_debug_trybot',
       'GPU Linux Builder': 'swarming_gpu_fyi_tests_gn_release_trybot',
       'GPU Mac Builder': 'swarming_gpu_fyi_tests_gyp_release_trybot',
       'GPU Mac Builder (dbg)': 'swarming_gpu_fyi_tests_gyp_debug_trybot',
       'GPU Win Builder': 'swarming_gpu_tests_deqp_gles_gyp_release_trybot_x86',
       'GPU Win Builder (dbg)':
         'swarming_gpu_tests_deqp_gles_gyp_debug_trybot_x86',
       'GPU Win Clang Builder (dbg)':
-        'swarming_gpu_fyi_tests_gyp_clang_debug_trybot_x86',
+        'swarming_gpu_fyi_tests_gyp_clang_debug_bot',
       'GPU Win x64 Builder':
         'swarming_gpu_tests_deqp_gles_gyp_release_trybot_x64',
       'GPU Win x64 Builder (dbg)':
         'swarming_gpu_tests_deqp_gles_gyp_debug_trybot_x64',
       'Linux ChromiumOS Builder':
         'swarming_gpu_fyi_tests_chromeos_gyp_release_trybot',
       'Linux Debug (NVIDIA)': 'none',
       'Linux Debug (New Intel)': 'none',
       'Linux Release (ATI)': 'none',
       'Linux Release (NVIDIA GeForce 730)': 'none',
@@ skipping 1312 matching lines @@
     'swarming_gpu_fyi_tests_gn_debug_trybot': [
       'swarming', 'gpu_tests', 'internal_gles2_conform_tests', 'gn',
       'debug_trybot', 'angle_deqp_tests',
     ],
 
     'swarming_gpu_fyi_tests_gn_release_trybot': [
       'swarming', 'gpu_tests', 'internal_gles2_conform_tests', 'gn',
       'release_trybot', 'angle_deqp_tests',
     ],
 
-    'swarming_gpu_fyi_tests_gyp_clang_debug_trybot_x86': [
-      'swarming', 'gpu_tests', 'internal_gles2_conform_tests', 'gyp',
-      'clang', 'debug_trybot', 'x86',
+    'swarming_gpu_fyi_tests_gyp_clang_debug_bot': [

[Ken Russell (switch to Gerrit), 2016/05/31 20:31:08]

This is misnamed now -- it's using gn below rather than gyp.

I think this should be renamed "swarming_gpu_fyi_win_clang_debug_bot" or
similar, and just include the win_clang_debug_bot mixin, plus "swarming",
"gpu_tests" and "internal_gles2_conform_tests". Then there's less likelihood of
it changing from how the main Clang bots work in the future.

+      'swarming', 'gpu_tests', 'internal_gles2_conform_tests',
+      'gn', 'clang', 'debug_bot_minimal_symbols',
     ],
 
     'swarming_gpu_fyi_tests_gyp_debug_trybot': [
       'swarming', 'gpu_tests', 'internal_gles2_conform_tests', 'gyp',
       'debug_trybot',
     ],
 
     'swarming_gpu_fyi_tests_gyp_release_trybot': [
       'swarming', 'gpu_tests', 'internal_gles2_conform_tests', 'gyp',
       'release_trybot',
@@ skipping 671 matching lines @@
     },
 
     'drfuzz': { 'gn_args': 'use_drfuzz=true' },
 
     'drmemory': {
       'gn_args': 'is_component_build=true enable_iterator_debugging=false',
       'gyp_defines': 'component=shared_library build_for_tool=drmemory',
     },
   },
 }