Run dEQP-GLES2 tests on the new AMD R7 Win bot.

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 571 matching lines @@
   },
 
   'angle_deqp_gles2_tests': {
     'tester_configs': [
       {
         '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.
+        # added. Also run on the AMD R7 240 bots.
         'build_configs': ['Release', 'Release_x64'],
         'swarming_dimension_sets': [
           {
             'gpu': '10de:104a',
             'os': 'Windows-2008ServerR2-SP1'
           },
           {
+            'gpu': '1002:6613',
+            'os': 'Windows-2008ServerR2-SP1'
+          },
+          {
             'gpu': '10de:104a',
             'os': 'Linux'
           }
         ],
       },
     ],
     'swarming': {
       'shards': 4,
     }
   },
 
   'angle_deqp_gles3_tests': {
     'tester_configs': [
       {
         'fyi_only': True,
         # TODO(jmadill): Run this on the optional tryservers.
         'run_on_optional': False,
         # Run only on the Win7 and Linux Release NVIDIA 32-bit bots
         # (and trybots) for the time being, at least until more capacity is
         # added.
+        # TODO(jmadill): Run on the Win AMD R7 240 bots once they are swarmed.
         'build_configs': ['Release'],
         'swarming_dimension_sets': [
           {
             'gpu': '10de:104a',
             'os': 'Windows-2008ServerR2-SP1'
           },
           {
             'gpu': '10de:104a',
             'os': 'Linux'
           }
@@ skipping 632 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())