Enable angle_deqp_gles2_tests on Nexus 5X.

content/test/gpu/generate_buildbot_json.py

 #!/usr/bin/env python
 # Copyright 2016 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.
 
 """Script to generate chromium.gpu.json and chromium.gpu.fyi.json in
 the src/testing/buildbot directory. Maintaining these files by hand is
 too unwieldy.
 """
 
@@ skipping 577 matching lines @@
             'os': 'Windows-2008ServerR2-SP1'
           }
         ],
       },
     ],
   },
 
   'angle_deqp_gles2_tests': {
     'tester_configs': [
       {
+        'allow_on_android': True,
         'fyi_only': True,
         # Run this on the optional tryservers.
         'run_on_optional': True,
         # Run only on the Win7 and Linux Release NVIDIA 32- and 64-bit bots
         # (and trybots) for the time being, at least until more capacity is
         # added. Also run on the AMD R7 240 bots.
-        'build_configs': ['Release', 'Release_x64'],
+        # Also run on Nexus 5X swarmed bots.
+        'build_configs': ['Release', 'Release_x64', 'android-chromium'],
         'swarming_dimension_sets': [
           {
             'gpu': '10de:104a',
             'os': 'Windows-2008ServerR2-SP1'
           },
           {
             'gpu': '1002:6613',
             'os': 'Windows-2008ServerR2-SP1'
           },
           {
             'gpu': '10de:104a',
             'os': 'Linux'
-          }
+          },
+          {
+            'device_type': 'bullhead',
+            'device_os': 'M',
+            'os': 'Android'
+          },
         ],
       },
     ],
-    'swarming': {
+    'desktop_swarming': {
       'shards': 4,
     }
   },
 
   'angle_deqp_gles3_tests': {
     'tester_configs': [
       {
         'fyi_only': True,
         # TODO(jmadill): Run this on the optional tryservers.
         'run_on_optional': False,
@@ skipping 151 matching lines @@
   },
 }
 
 # This requires a hack because the isolate's name is different than
 # the executable's name. On the few non-swarmed testers, this causes
 # the executable to not be found. It would be better if the Chromium
 # recipe supported running isolates locally. crbug.com/581953
 
 NON_SWARMED_GTESTS = {
   'tab_capture_end2end_tests': {
+     'swarming': {
+       'can_use_on_swarming_builders': False
+     },
      'test': 'browser_tests',
      'args': [
        '--enable-gpu',
        '--test-launcher-jobs=1',
        '--gtest_filter=CastStreamingApiTestWithPixelOutput.EndToEnd*:' + \
            'TabCaptureApiPixelTest.EndToEnd*'
      ]
   }
 }
 
@@ skipping 351 matching lines @@
           }
         ]
       })
   if 'desktop_args' in result:
     if not is_android(tester_config):
       if not 'args' in result:
         result['args'] = []
       result['args'] += result['desktop_args']
     # Don't put the desktop args in the JSON.
     result.pop('desktop_args')
+  if 'desktop_swarming' in result:
+    if not is_android(tester_config):
+      result['swarming'].update(result['desktop_swarming'])
+    # Don't put the desktop_swarming in the JSON.
+    result.pop('desktop_swarming')
 
   # This flag only has an effect on the Linux bots that run tests
   # locally (as opposed to via Swarming), which are only those couple
   # on the chromium.gpu.fyi waterfall. Still, there is no harm in
   # specifying it everywhere.
   result['use_xvfb'] = False
   return result
 
 def generate_telemetry_test(tester_name, tester_config,
                             test, test_config, is_fyi,
@@ skipping 104 matching lines @@
     json.dump(tests, fp, indent=2, separators=(',', ': '), sort_keys=True)
     fp.write('\n')
 
 def main():
   generate_all_tests(FYI_WATERFALL, True)
   generate_all_tests(WATERFALL, False)
   return 0
 
 if __name__ == "__main__":
   sys.exit(main())