Flip GN bots to be purely driven by //testing/buildbot/*.json files for tests.

scripts/slave/recipes/chromium_gn.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 infra.libs.infra_types import freeze
 
 DEPS = [
   'bot_update',
   'chromium',
   'chromium_tests',
@@ skipping 28 matching lines @@
   },
   'chromium.webkit': {
     'builders': {
       'Linux GN': {
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_PLATFORM': 'linux',
           'TARGET_BITS': 64,
         },
         'gclient_apply_config': ['blink'],
-        'should_run_mojo_tests': True,
       },
       'Linux GN (dbg)': {
         'chromium_apply_config': ['gn_component_build'],
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_PLATFORM': 'linux',
           'TARGET_BITS': 64,
         },
         'gclient_apply_config': ['blink'],
       },
@@ skipping 46 matching lines @@
           'TARGET_ARCH': 'arm',
         },
         'gclient_apply_config': ['android'],
       },
       'Linux GN': {
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_PLATFORM': 'linux',
           'TARGET_BITS': 64,
         },
-        'should_run_gn_check': False,
-        'should_run_tests': True,
       },
       'Linux GN Clobber': {
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_PLATFORM': 'linux',
           'TARGET_BITS': 64,
         },
         'force_clobber': True,
       },
       'Linux GN (dbg)': {
@@ skipping 45 matching lines @@
   'tryserver.chromium.linux': {
     'builders': {
       'android_chromium_gn_compile_rel': {
         'chromium_apply_config': ['gn_minimal_symbols'],
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'arm',
         },
         'gclient_apply_config': ['android'],
-        'should_run_gn_check': False,
       },
       'android_chromium_gn_compile_dbg': {
         'chromium_apply_config': ['gn_minimal_symbols'],
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'arm',
         },
         'gclient_apply_config': ['android'],
       },
       'linux_chromium_gn_rel': {
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_PLATFORM': 'linux',
           'TARGET_BITS': 64,
         },
-        'should_run_gn_check': False,
-        'should_run_tests': True,
       },
       'linux_chromium_gn_dbg': {
         'chromium_apply_config': ['gn_component_build'],
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_PLATFORM': 'linux',
           'TARGET_BITS': 64,
         },
       },
       'linux_chromium_gn_chromeos_rel': {
@@ skipping 280 matching lines @@
             build_output_dir='//out/%s' % api.chromium.c.build_config_fs)
     if requires_compile:
       api.chromium.compile(compile_targets,
                            force_clobber=force_clobber)
     tests = tests_in_compile_targets(api, compile_targets, tests)
   else:
     api.chromium.compile(all_compile_targets(api, tests) +
                          additional_compile_targets,
                          force_clobber=force_clobber)
 
-  # TODO(dpranke): Ensure that every bot runs w/ --check, then make
-  # it be on by default.
-  if bot_config.get('should_run_gn_check', True):
-    api.chromium.run_gn_check()
-
-  if tests and bot_config.get('should_run_tests', False):
+  if tests:
     if api.tryserver.is_tryserver:
       api.chromium_tests.run_tests_and_deapply_as_needed(
           mastername, api, tests, bot_update_step)
     else:
       api.chromium_tests.configure_swarming('chromium', precommit=False,
                                             mastername=mastername)
       test_runner = api.chromium_tests.create_test_runner(api, tests)
       with api.chromium_tests.wrap_chromium_tests(mastername):
         test_runner()
 
 
 def GenSteps(api):
   with api.tryserver.set_failure_hash():
     return _GenStepsInternal(api)
 
 
 def GenTests(api):
   overrides = {}
   for mastername, master_dict in BUILDERS.items():
     for buildername in master_dict['builders']:
+
+      # The Android bots are currently all only builders and cannot
+      # run tests; more importantly, the recipe isn't set up to run
+      # tests on Android correctly, and if we specify any tests in
+      # the step_data, the recipe will crash :). We will eventually
+      # fix this by killing this recipe altogether and moving to the
+      # main chromium recipes.
+      is_android = ('Android' in buildername or 'android' in buildername)
+      gtest_tests = [] if is_android else ['base_unittests']
+
       overrides.setdefault(mastername, {})
       overrides[mastername][buildername] = (
           api.override_step_data(
               'read test spec',
               api.json.output({
                   buildername: {
-                    'gtest_tests': ['base_unittests'],
+                    'gtest_tests': gtest_tests,
                   },
               })))
 
       if 'tryserver' in mastername:
           overrides[mastername][buildername] += api.override_step_data(
             'analyze',
             api.json.output({
                 'status': 'Found dependency',
-                'targets': ['base_unittests'],
-                'build_targets': ['base_unittests'],
+                'targets': gtest_tests,
+                'build_targets': gtest_tests,
             }))
 
   for test in api.chromium.gen_tests_for_builders(BUILDERS, overrides):
     yield test
 
   yield (
     api.test('compile_failure') +
     api.platform.name('linux') +
     api.properties.tryserver(
         buildername='linux_chromium_gn_rel',
@@ skipping 25 matching lines @@
            'gtest_tests': ['base_unittests'],
         }})) +
     api.override_step_data(
         'analyze',
         api.json.output({
           'status': 'Found dependency',
           'targets': ['net_unittests'],
           'build_targets': ['net_unittests'],
         }))
   )