Revert of Enable hermetic builds for FYI mac builders.

scripts/slave/recipe_modules/chromium_tests/chromium_fyi.py

 # Copyright 2014 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.
 
 from . import steps
 
 RESULTS_URL = 'https://chromeperf.appspot.com'
 
 
 def get_kitchen_spec(use_cache=False):
@@ skipping 25 matching lines @@
 
 
 SPEC = {
   'settings': {
     'build_gs_bucket': 'chromium-fyi-archive',
   },
   'builders': {
     'Chromium Mac 10.10 MacViews': {
       'chromium_config': 'chromium',
       'gclient_config': 'chromium',
-      'chromium_apply_config': [
-        'chromium_mac_mac_views',
-        'mb',
-        'force_mac_toolchain'
-      ],
+      'chromium_apply_config': ['chromium_mac_mac_views', 'mb'],
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 64,
       },
       'test_generators': [
         steps.generate_gtest,
         steps.generate_script,
         steps.generate_isolated_script,
       ],
       'testing': {
         'platform': 'mac',
       },
     },
     'Chromium Mac 10.11': {
       'chromium_config': 'chromium',
-      'chromium_apply_config': ['mb', 'force_mac_toolchain'],
+      'chromium_apply_config': ['mb'],
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 64,
       },
       'test_generators': [
         steps.generate_gtest,
         steps.generate_script,
+      ],
+      'testing': {
+        'platform': 'mac',
+      },
+    },
+    'Chromium Mac 10.11 Force Mac Toolchain': {
+      'chromium_config': 'chromium',
+      'chromium_apply_config': ['mb'],
+      'gclient_config': 'chromium',
+      'chromium_config_kwargs': {
+        'BUILD_CONFIG': 'Release',
+        'TARGET_BITS': 64,
+      },
+      'chromium_apply_config': ['force_mac_toolchain'],
+      'test_generators': [
+        steps.generate_gtest,
+        steps.generate_script,
       ],
       'testing': {
         'platform': 'mac',
       },
     },
     'Linux ARM': {
       'chromium_config': 'chromium',
       'gclient_config': 'chromium',
       'chromium_apply_config': ['mb', 'ninja_confirm_noop'],
       'chromium_config_kwargs': {
@@ skipping 155 matching lines @@
         steps.PrintPreviewTests(),
       ],
       'bot_type': 'builder_tester',
       'testing': {
         'platform': 'linux',
       },
     },
     'Print Preview Mac': {
       'chromium_config': 'chromium',
       'gclient_config': 'chromium',
-      'chromium_apply_config': ['force_mac_toolchain'],
       'GYP_DEFINES': {
         'component': 'shared_library',
       },
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_PLATFORM': 'mac',
         'TARGET_BITS': 64,
       },
       'tests': [
         steps.PrintPreviewTests(),
@@ skipping 100 matching lines @@
         steps.generate_isolated_script,
       ],
       'bot_type': 'builder_tester',
       'testing': {
         'platform': 'linux',
       },
     },
     'Mac OpenSSL': {
       'chromium_config': 'chromium',
       'gclient_config': 'chromium',
-      'chromium_apply_config': ['force_mac_toolchain'],
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 32,
       },
       'GYP_DEFINES': {
         'use_openssl': '1',
       },
       'test_generators': [
         steps.generate_gtest,
         steps.generate_script,
@@ skipping 749 matching lines @@
       },
       'compile_targets': [ 'chromium_builder_tests' ],
       'goma_canary': True,
       'tests': steps.GOMA_TESTS,
       'testing': {
         'platform': 'linux'
       }
     },
     'Chromium Mac 10.9 Goma Canary': {
       'chromium_config': 'chromium',
-      'chromium_apply_config': ['goma_canary', 'mb', 'force_mac_toolchain'],
+      'chromium_apply_config': ['goma_canary', 'mb'],
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 64,
       },
       'compile_targets': [ 'chromium_builder_tests' ],
       'goma_canary': True,
       'tests': steps.GOMA_TESTS,
       'testing': {
         'platform': 'mac'
       }
     },
     'Chromium Mac 10.9 Goma Canary (dbg)': {
       'chromium_config': 'chromium',
-      'chromium_apply_config': ['goma_canary', 'mb', 'force_mac_toolchain'],
+      'chromium_apply_config': ['goma_canary', 'mb'],
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Debug',
         'TARGET_BITS': 64,
       },
       'compile_targets': [ 'chromium_builder_tests' ],
       'goma_canary': True,
       'tests': steps.GOMA_TESTS,
       'testing': {
         'platform': 'mac'
       }
     },
     'Chromium Mac 10.9 Goma Canary (clobber)': {
       'chromium_config': 'chromium',
-      'chromium_apply_config': [
-        'clobber',
-        'goma_canary',
-        'mb',
-        'force_mac_toolchain',
-      ],
+      'chromium_apply_config': ['clobber', 'goma_canary', 'mb'],
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 64,
       },
       'compile_targets': [ 'chromium_builder_tests' ],
       'goma_canary': True,
       'tests': steps.GOMA_TESTS,
       'testing': {
         'platform': 'mac'
       }
     },
     'Chromium Mac 10.9 Goma Canary (dbg)(clobber)': {
       'chromium_config': 'chromium',
-      'chromium_apply_config': [
-        'clobber',
-        'goma_canary',
-        'mb',
-        'force_mac_toolchain',
-      ],
+      'chromium_apply_config': ['clobber', 'goma_canary', 'mb'],
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Debug',
         'TARGET_BITS': 64,
       },
       'compile_targets': [ 'chromium_builder_tests' ],
       'goma_canary': True,
       'tests': steps.GOMA_TESTS,
       'testing': {
         'platform': 'mac'
@@ skipping 198 matching lines @@
             android_tool='asan'),
         steps.GTestTest('gfx_unittests', android_tool='asan'),
       ],
       'testing': {
         'platform': 'linux',
       },
     },
     'ClangToTMac': {
       'chromium_config': 'clang_tot_mac',
       'gclient_config': 'chromium',
-      'chromium_apply_config': ['mb', 'force_mac_toolchain'],
+      'chromium_apply_config': ['mb'],
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 64,
       },
       'GYP_DEFINES': {
         'component': 'shared_library',
       },
       'compile_targets': [
         'all',
       ],
       'bot_type': 'builder',
       'testing': { 'platform': 'mac', },
       'tests': {
         steps.SizesStep(RESULTS_URL, 'ClangToTMac')
       },
       'use_isolate': True,
       'enable_swarming': True,
       # Workaround so that recipes doesn't add random build targets to our
       # compile line. We want to build everything.
       'add_tests_as_compile_targets': False,
     },
     'ClangToTMac tester': {
       'chromium_config': 'chromium_no_goma',
-      'chromium_apply_config': ['force_mac_toolchain'],
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 64,
       },
       'test_generators': [
         steps.generate_gtest,
         steps.generate_script,
         steps.generate_isolated_script,
       ],
       'bot_type': 'tester',
       'parent_buildername': 'ClangToTMac',
       'testing': {
         'platform': 'mac',
       },
       'enable_swarming': True,
     },
     'ClangToTMac (dbg)': {
       'chromium_config': 'clang_tot_mac',
-      'chromium_apply_config': ['mb', 'force_mac_toolchain'],
+      'chromium_apply_config': ['mb'],
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Debug',
         'TARGET_BITS': 64,
       },
       'compile_targets': [
         'all',
       ],
       'bot_type': 'builder',
       'testing': { 'platform': 'mac', },
       'tests': {
         steps.SizesStep(RESULTS_URL, 'ClangToTMac (dbg)')
       },
       'use_isolate': True,
       'enable_swarming': True,
       # Workaround so that recipes doesn't add random build targets to our
       # compile line. We want to build everything.
       'add_tests_as_compile_targets': False,
     },
     'ClangToTMacASan': {
       'chromium_config': 'clang_tot_mac_asan',
-      'chromium_apply_config': ['mb', 'force_mac_toolchain'],
+      'chromium_apply_config': ['mb'],
       'gclient_config': 'chromium',
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 64,
       },
       'compile_targets': [
         'all',
       ],
       'bot_type': 'builder',
       'testing': { 'platform': 'mac', },
       'tests': {
         steps.SizesStep(RESULTS_URL, 'ClangToTMacASan')
       },
       'use_isolate': True,
       'enable_swarming': True,
       # Workaround so that recipes doesn't add random build targets to our
       # compile line. We want to build everything.
       'add_tests_as_compile_targets': False,
     },
     'ClangToTMacASan tester': {
       'chromium_config': 'chromium_mac_asan',
       'gclient_config': 'chromium',
-      'chromium_apply_config': ['force_mac_toolchain'],
       'chromium_config_kwargs': {
         'BUILD_CONFIG': 'Release',
         'TARGET_BITS': 64,
       },
       'test_generators': [
         steps.generate_gtest,
         steps.generate_script,
         steps.generate_isolated_script,
       ],
       'bot_type': 'tester',
@@ skipping 558 matching lines @@
       'enable_swarming': True,
       'testing': {
         'platform': 'win',
       },
     },
 
     'Linux Kitchen (kitchen_run)': get_kitchen_spec(use_cache=True),
     'Linux Kitchen (annotated_run)': get_kitchen_spec(),
   },
 }