Make tab_capture_end2end_tests work as a regular windowed_test_launcher.

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 1452 matching lines @@
     ],
     # Don't run these tests on Android.
     'disabled_tester_configs': [
       {
         'names': [
           'Linux ChromiumOS Ozone (Intel)',
         ],
         'os_types': ['android'],
       },
     ],
+    'args': [
+      '--enable-gpu',
+      '--test-launcher-bot-mode',
+      '--test-launcher-jobs=1',
+      '--gtest_filter=CastStreamingApiTestWithPixelOutput.EndToEnd*:' + \
+          'TabCaptureApiPixelTest.EndToEnd*'
+    ],
+    'linux_args': [ '--no-xvfb' ],
+    'test': 'browser_tests',
   },
   'video_decode_accelerator_d3d11_unittest': {
     'tester_configs': [
       {
         'os_types': ['win']
       },
     ],
     'args': [
       '--use-angle=d3d11',
       '--use-test-data-path',
@@ skipping 57 matching lines @@
       {
         'names': [
           'Linux ChromiumOS Ozone (Intel)',
         ],
         'os_types': ['android'],
       },
     ],
     'test': 'browser_tests',
     'args': [
       '--enable-gpu',
+      '--no-xvfb',
       '--test-launcher-jobs=1',
       '--gtest_filter=CastStreamingApiTestWithPixelOutput.EndToEnd*:' + \
           'TabCaptureApiPixelTest.EndToEnd*'
     ],
     'swarming': {
       'can_use_on_swarming_builders': False,
     },
   }
 }
 
@@ skipping 519 matching lines @@
 def matches_swarming_dimensions(tester_config, dimension_sets):
   for dimensions in dimension_sets:
     for cur_dims in tester_config['swarming_dimensions']:
       if set(dimensions.items()).issubset(cur_dims.items()):
         return True
   return False
 
 def is_android(tester_config):
   return tester_config['os_type'] == 'android'
 
+def is_linux(tester_config):
+  return tester_config['os_type'] == 'linux'
+
 def is_asan(tester_config):
   return tester_config.get('is_asan', False)
 
 
 # Returns a list describing the type of this tester. It may include
 # both the type of the bot as well as the waterfall.
 def get_tester_type(tester_config):
   result = []
   if 'type' in tester_config:
     result.append(tester_config['type'])
@@ skipping 94 matching lines @@
           {
             'link': [
               'https://luci-logdog.appspot.com/v/?s',
               '=android%2Fswarming%2Flogcats%2F',
               '${TASK_ID}%2F%2B%2Funified_logcats'
             ],
             'name': 'shard #${SHARD_INDEX} logcats'
           }
         ]
       })
-  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 'android_args' in result:
-    if is_android(tester_config):
-      if not 'args' in result:
-        result['args'] = []
-      result['args'] += result['android_args']
-    # Don't put the android args in the JSON.
-    result.pop('android_args')
+
+  def add_conditional_args(key, fn):
+    if key in result:
+      if fn(tester_config):
+        if not 'args' in result:
+          result['args'] = []
+        result['args'] += result[key]
+      # Don't put the conditional args in the JSON.
+      result.pop(key)

[Ken Russell (switch to Gerrit), 2017/04/26 00:55:44]

Nice cleanup. Thanks.

+
+  add_conditional_args('desktop_args', lambda cfg: not is_android(cfg))
+  add_conditional_args('linux_args', is_linux)
+  add_conditional_args('android_args', is_android)
+
   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')
   # Remove the tester_configs and disabled_tester_configs, if present,
   # from the result.
   remove_tester_configs_from_result(result)
 
   # This flag only has an effect on the Linux bots that run tests
@@ skipping 151 matching lines @@
   install_parent_links(WATERFALL)
   install_parent_links(V8_FYI_WATERFALL)
 
   generate_all_tests(FYI_WATERFALL, 'chromium.gpu.fyi.json')
   generate_all_tests(WATERFALL, 'chromium.gpu.json')
   generate_all_tests(V8_FYI_WATERFALL, 'client.v8.fyi.json')
   return 0
 
 if __name__ == "__main__":
   sys.exit(main())