Add 'CFI Linux Full' buildbot (src part).

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 76 matching lines @@
 
     'chromium.fyi': {
       'Afl Upload Linux ASan': 'gn_release_afl_asan',
       'Android ChromeDriver Tests (dbg)': 'none',
       'Android Cloud Tests': 'android_gn_debug_static_bot_x86',
       'Android Remoting Tests': 'none',
       'Android Tests (trial)(dbg)': 'none',
       'Android Tests (x86 emulator)': 'android_gn_debug_static_bot_x86',
       'Android Builder (dbg)': 'android_gn_debug_static_bot',
       'Browser Side Navigation Linux': 'gn_release_bot',
-      'CFI Linux CF': 'gn_cfi_diag_release_static',
-      'CFI Linux ToT': 'gn_cfi_clang_tot_release_static',
+      'CFI Linux CF': 'gn_cfi_full_diag_release_static',
+      'CFI Linux ToT': 'gn_cfi_full_clang_tot_release_static',
       'CFI Linux': 'gn_cfi_release_static',
+      'CFI Linux Full': 'gn_cfi_full_release_static',
       'Chromium Linux Goma Canary': 'gn_release_bot',
       'Chromium Linux Goma Canary (clobber)': 'gn_release_bot',
       'Chromium Linux Precise Goma LinkTest': 'gn_release_bot',
       'Chromium Linux32 Goma Canary (clobber)': 'gn_release_bot_x86',
       'Chromium Mac 10.10 MacViews': 'mac_views_browser_gyp_release_bot',
       'Chromium Mac 10.11': 'gyp_release_bot',
       'Chromium Mac 10.11 Force Mac Toolchain': 'gyp_release_bot',
       'Chromium Mac 10.9 Goma Canary': 'gyp_release_bot',
       'Chromium Mac 10.9 Goma Canary (clobber)': 'gyp_release_bot',
       'Chromium Mac 10.9 Goma Canary (dbg)': 'gyp_debug_bot',
@@ skipping 612 matching lines @@
       'chromeos_x86-generic_variable': 'findit',
       'chromium_presubmit': 'none',
       'closure_compilation': 'closure_compilation',
       'linux_arm': 'swarming_gn_release_trybot_arm',
       'linux_chromium_archive_rel_ng': 'noswarming_gn_release_bot',
       'linux_chromium_asan_rel_ng': 'swarming_asan_lsan_gn_release_trybot',
       'linux_chromium_asan_variable': 'findit',
       'linux_chromium_blimp_variable': 'findit',
       'linux_chromium_browser_side_navigation_rel': 'gn_release_trybot',
       'linux_chromium_cast_variable': 'findit',
-      'linux_chromium_cfi_rel_ng': 'gn_cfi_release_static_dcheck_always_on',
+      'linux_chromium_cfi_rel_ng':
+        'gn_cfi_full_release_static_dcheck_always_on',
       'linux_chromium_chromeos_asan_rel_ng':
         'swarming_asan_lsan_chromeos_gn_release_trybot',
       'linux_chromium_chromeos_asan_variable': 'findit',
       'linux_chromium_chromeos_compile_dbg_ng':
         'swarming_chromeos_gn_debug_trybot',
       'linux_chromium_chromeos_compile_rel_ng':
         'swarming_chromeos_gn_release_trybot',
       'linux_chromium_chromeos_dbg_ng':
         'swarming_chromeos_gn_debug_trybot',
       'linux_chromium_chromeos_msan_rel_ng':
@@ skipping 334 matching lines @@
 
     # The 'findit' config is used by the *_variable_* bots, which run
     # the 'FindIt' recipes and code to bisect failures that happen on the
     # other waterfall bots. The findit recipes actually override and
     # re-use the configs from the matching waterfall bots, and so it should
     # be an error if MB ever sees an actual *_variable_* bot name.
     'findit': [
       'error',
     ],
 
-    'gn_cfi_diag_release_static': [
-      'gn', 'cfi', 'cfi_diag', 'release', 'static',
+    'gn_cfi_full_diag_release_static': [
+      'gn', 'cfi', 'cfi_cast', 'cfi_diag', 'release', 'static',

[Dirk Pranke, 2016/07/20 23:29:54]

The 'cfi_cast' mixin should just include the 'cfi' mixin, since it's not like
you will want the former w/o the later.

[krasin1, 2016/07/20 23:34:21]

Done.

     ],
 
     'gn_cfi_release_static': [
       'gn', 'cfi', 'release', 'static',
     ],
 
-    'gn_cfi_clang_tot_release_static': [
-      'gn', 'cfi', 'clang_tot', 'release', 'static',
+    'gn_cfi_full_release_static': [
+      'gn', 'cfi', 'cfi_cast', 'release', 'static',
     ],
 
-    'gn_cfi_release_static_dcheck_always_on': [
-      'gn', 'cfi', 'release', 'static', 'dcheck_always_on',
+    'gn_cfi_full_clang_tot_release_static': [
+      'gn', 'cfi', 'cfi_cast', 'clang_tot', 'release', 'static',
+    ],
+
+    'gn_cfi_full_release_static_dcheck_always_on': [
+      'gn', 'cfi', 'cfi_cast', 'release', 'static', 'dcheck_always_on',
     ],
 
     'gn_debug_bot': [
       'gn', 'debug_bot',
     ],
 
     'gn_debug_bot_minimal_symbols_chrome_with_codecs': [
       'gn', 'debug_bot_minimal_symbols', 'chrome_with_codecs',
     ],
 
@@ skipping 814 matching lines @@
     'cast': {
       'gn_args': 'is_chromecast=true',
       'gyp_defines': 'chromecast=1',
     },
 
     'cfi': {
       'gn_args': 'is_cfi=true',
       'gyp_defines': 'cfi_vptr=1',
     },
 
+    'cfi_cast': {

[Dirk Pranke, 2016/07/20 23:29:54]

i.e., add 'mixins': ['cfi'] here.

[krasin1, 2016/07/20 23:34:21]

This is a great suggestion: not only it makes it harder to make a mistake, it
also allowed to rename cfi_cast to cfi_full, so there's even less name
confusion.

+      'gn_args': 'use_cfi_cast=true',
+      'gyp_defines': 'cfi_cast=1',
+    },
+
     'cfi_diag': {
       'gn_args': 'use_cfi_diag=true',
       'gyp_defines': 'cfi_diag=1',
     },
 
     'chrome_with_codecs': {
       'mixins': ['ffmpeg_branding_chrome', 'proprietary_codecs'],
     },
 
     'chromeos': {
@@ skipping 363 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',
     },
   },
 }