fyi: Remove buildrunner_tests from win_tests, switch chrome_elf_unittests to run without it.

masters/master.chromium.fyi/master.cfg

 # vim: ft=python:
 # Copyright (c) 2012 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 buildbot.scheduler import Dependent
 from buildbot.scheduler import Nightly
 from buildbot.scheduler import Periodic
 from buildbot.scheduler import Scheduler
 from buildbot.scheduler import Triggerable
@@ skipping 531 matching lines @@
                'archive_build': False,
                'generate_gtest_json': True
            })
 
 
 def without(these, notthese):
   return [x for x in these if x not in notthese]
 
 tests_win_1 = ['base_unittests',
                'cacheinvalidation_unittests',
-               'chrome_elf_unittests_br',
+               'chrome_elf_unittests',
                'components_unittests',
                'courgette_unittests',
                'crypto_unittests',
                'device_unittests',
                'extensions_unittests',
                'gcm_unit_tests',
                'google_apis_unittests',
                'gpu',
                'installer',
                'jingle',
                'media',
                'net',
                'ppapi_unittests',
                'printing',
                'remoting',
                'sandbox',
                'unit',
                'url_unittests',
-               'buildrunner_tests',
 ]
 tests_win_2 = ['browser_tests',
                'content_browsertests']
 
 f_chromium_dbg_tests_1 = win_build().ChromiumFactory(
     slave_type='Tester',
     target='Debug',
     build_url=chromium_dbg_archive,
     tests=tests_win_1,
     factory_properties={'process_dumps': True,
@@ skipping 105 matching lines @@
     ],
     factory_properties={
         'asan': True,
         'cluster_size': 1,
         'gclient_env': {
             'GYP_DEFINES': ('asan=1 '
                             'chromeos=1 '
                             'lsan=1 '
                             'use_aura=1 '
                             'use_allocator=none '),
-            'GYP_GENERATORS': 'ninja', },
+            },
         'lsan': True,
         'sharded_tests': sharded_tests,
         'retry_failed': False,
     },
     tests=[
       'browser_tests',
       'content_browsertests',
       'interactive_ui_tests',
     ],
 )
 
 # DrMemory Builder
 f_chromium_windows_drmemory_builder = win_out().ChromiumFactory(
     target='Release',
     slave_type='Builder',
     # TODO(bruening): remove "_dbg" from this name in all.gyp as it is
     # not limited to just Debug.
     options=['--build-tool=ninja', '--', 'chromium_builder_dbg_drmemory_win'],
     factory_properties={
         'gclient_env': { 'GYP_DEFINES' : ('build_for_tool=drmemory '
                                           'component=shared_library'),
-                         'GYP_GENERATORS': 'ninja'},
+                       },
         'package_pdb_files': True,
         'trigger': 'chromium_windows_drmemory'})
 
 # Windows Tests (DrMemory XP)
 f_chromium_rel_win_drmemory = win_out().ChromiumFactory(
     slave_type='Tester',
     target='Release',
     build_url=chromium_windows_drmemory_archive,
     tests=[
       'drmemory_light_url',
@@ skipping 90 matching lines @@
       'gclient_env': {
         'GYP_DEFINES': 'target_arch=x64',
     }})
 
 win_clang_tests = tests_win_1 + tests_win_2 + ['content_unittests']
 
 f_chromium_win_clang = win_out().ChromiumFactory(
     slave_type='BuilderTester',
     target='Release',
     tests=win_clang_tests,
-    options=['--build-tool=ninja', '--', 'chromium_builder_tests'],
+    options=['chromium_builder_tests'],
     factory_properties={
       'gclient_env': {
         'GYP_DEFINES': 'clang=1',
     }})
 
 f_chromium_win_clang_dbg = win_out().ChromiumFactory(
     slave_type='BuilderTester',
     target='Debug',
     tests=win_clang_tests,
-    options=['--build-tool=ninja', '--', 'chromium_builder_tests'],
+    options=['chromium_builder_tests'],
     factory_properties={
       'gclient_env': {
         'GYP_DEFINES': 'clang=1',
     }})
 
 f_chromium_win_clang_shared = win_out().ChromiumFactory(
     slave_type='BuilderTester',
     target='Release',
     tests=win_clang_tests,
-    options=['--build-tool=ninja', '--', 'chromium_builder_tests'],
+    options=['chromium_builder_tests'],
     factory_properties={
       'gclient_env': {
         'GYP_DEFINES': 'clang=1 component=shared_library',
     }})
 
 f_chromium_win_clang_asan = win_out().ChromiumFactory(
     slave_type='BuilderTester',
     target='Release',
     # ASan doesn't support sandboxing on Windows yet (http://crbug.com/382867).
     tests=without(win_clang_tests, ['sandbox']),
-    options=['--build-tool=ninja', '--', 'chromium_builder_tests'],
+    options=['chromium_builder_tests'],
     factory_properties={
       'asan': True,
       'gclient_env': {
         'GYP_DEFINES': 'clang=1 asan=1 component=static_library disable_nacl=1',
         'LLVM_FORCE_HEAD_REVISION': 'yes',
     }})
 
 f_chromium_win_ninja_shared_2013_dbg = win_out().ChromiumFactory(
     slave_type='BuilderTester',
-    options=['--build-tool=ninja', 'chromium_builder_tests'],
+    options=['chromium_builder_tests'],
     tests=tests_win_1,
     target='Debug',
     factory_properties={
         'gclient_env': {
           'GYP_DEFINES': 'component=shared_library fastbuild=1',
     }})
 
 f_chromium_win_ninja_shared_2013 = win_out().ChromiumFactory(
     slave_type='BuilderTester',
-    options=['--build-tool=ninja', 'chromium_builder_tests'],
+    options=['chromium_builder_tests'],
     tests=tests_win_1,
     target='Release',
     factory_properties={
         'gclient_env': {
           'GYP_DEFINES': 'component=shared_library fastbuild=1',
     }})
 
 f_chromium_win_ninja_goma_shared_2013_dbg = win_out().ChromiumFactory(
     slave_type='BuilderTester',
     options=[
-        '--build-tool=ninja', '--compiler=goma', '--',
+        '--compiler=goma', '--',
         'chromium_builder_tests'
     ],
     tests=tests_win_1 + ['diagnose_goma'],
     target='Debug',
     factory_properties={
         'goma_canary': True,
         'slave_internal_url': config.Master.slave_internal_url,
         'gclient_env': {
           'GYP_DEFINES': (
               'component=shared_library win_z7=1 chromium_win_pch=0'
           ),
     }})
 
 f_chromium_win_ninja_goma_shared_2013 = win_out().ChromiumFactory(
     slave_type='BuilderTester',
     options=[
-        '--build-tool=ninja', '--compiler=goma', '--',
+        '--compiler=goma', '--',
         'chromium_builder_tests'
     ],
     tests=tests_win_1 + ['diagnose_goma'],
     target='Release',
     factory_properties={
         'goma_canary': True,
         'slave_internal_url': config.Master.slave_internal_url,
         'gclient_env': {
           'GYP_DEFINES': (
               'component=shared_library fastbuild=1 chromium_win_pch=0'
@@ skipping 190 matching lines @@
       'slave_internal_url': config.Master.slave_internal_url,
       'lkgr': True,
     },
     tests=['diagnose_goma'])
 
 f_chromium_mac_ninja_goma_canary = mac().ChromiumFactory(
     slave_type='BuilderTester',
     clobber=True,
     target='Release',
     options=[
-      '--build-tool=ninja',
       '--compiler=goma-clang',
     ],
     factory_properties={
       'goma_canary': True,
       'slave_internal_url': config.Master.slave_internal_url,
       'lkgr': True,
     },
     tests=['diagnose_goma'])
 
 f_chromium_mac_108_x64_experimental = mac().ChromiumFactory(
@@ skipping 1077 matching lines @@
       sendToInterestedUsers=False))
 
 c['status'].append(MailNotifier(
       fromaddr=ActiveMaster.from_address,  # Reply-To address
       mode='problem',
       relayhost=config.Master.smtp,
       subject='Cronet build failed on %(builder)s',
       extraRecipients=['cronet+buildproblem@google.com'],
       sendToInterestedUsers=False,
       builders=['Android Cronet Builder', 'Android Cronet Builder (dbg)']))