Re-land dEQP ES3 tests on Windows ANGLE bots.

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 747 matching lines @@
     'tester_configs': [
       {
         'fyi_only': True,
         # Run this on the optional tryservers.
         'run_on_optional': True,
         # Run only on the Win7 NVIDIA/AMD R7 240 32- and 64-bit bots (and
         # trybots) for the time being, at least until more capacity is
         # added.
         'build_configs': ['Release', 'Release_x64'],
         'swarming_dimension_sets': [
+          # NVIDIA Win 7
           {
             'gpu': '10de:104a',
             'os': 'Windows-2008ServerR2-SP1'
           },
+          # AMD Win 7
           {
             'gpu': '1002:6613',
             'os': 'Windows-2008ServerR2-SP1'
           },
         ],
       },
     ],
     'desktop_swarming': {
       'shards': 4,
     },
     'test': 'angle_deqp_gles2_tests',
     'args': [
       '--test-launcher-batch-limit=400',
       '--deqp-egl-display-type=angle-d3d11'
     ]
   },
 
   'angle_deqp_gles2_gl_tests': {
     'tester_configs': [
       {
         'fyi_only': True,
         # Run this on the optional tryservers.
         'run_on_optional': True,
         # Run only on the Linux Release NVIDIA 32- and 64-bit bots (and
         # trybots) for the time being, at least until more capacity is added.
         'build_configs': ['Release', 'Release_x64'],
         'swarming_dimension_sets': [
+          # NVIDIA Linux
           {
             'gpu': '10de:104a',
             'os': 'Linux'
           },
         ],
       },
     ],
     'desktop_swarming': {
       'shards': 4,
     },
     'test': 'angle_deqp_gles2_tests',
     'args': [
       '--test-launcher-batch-limit=400',
       '--deqp-egl-display-type=angle-gl'
     ]
   },
 
   'angle_deqp_gles2_gles_tests': {
     'tester_configs': [
       {
         'allow_on_android': True,
         'fyi_only': True,
         # Run this on the optional tryservers.
         'run_on_optional': True,
         # Run on Nexus 5X swarmed bots.
         'build_configs': ['android-chromium'],
         'swarming_dimension_sets': [
+          # Nexus 5X
           {
             'device_type': 'bullhead',
             'device_os': 'M',
             'os': 'Android'
           }
         ],
       },
     ],
     'test': 'angle_deqp_gles2_tests',
     # Only pass the display type to desktop. The Android runner doesn't support
     # passing args to the executable but only one display type is supported on
     # Android anyways.
     'desktop_args': [
       '--test-launcher-batch-limit=400',
       '--deqp-egl-display-type=angle-gles'
     ],
     'android_args': ['--enable-xml-result-parsing']
   },
 
   'angle_deqp_gles3_d3d11_tests': {
     'tester_configs': [
       {
         'fyi_only': True,
-        # TODO(jmadill): Run this on the optional tryservers.
+        # TODO(jmadill): Run this on ANGLE roll tryservers.
         'run_on_optional': False,
-        # Run only on the Win7 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.
+        # Run only on the NVIDIA and AMD Win7 bots (and trybots) for the time
+        # being, at least until more capacity is added.
         'build_configs': ['Release'],
         'swarming_dimension_sets': [
+          # NVIDIA Win 7
           {
             'gpu': '10de:104a',
             'os': 'Windows-2008ServerR2-SP1'
+          },
+          # AMD Win 7
+          {
+            'gpu': '1002:6613',
+            'os': 'Windows-2008ServerR2-SP1'
           }
         ],
       }
     ],
     'swarming': {
       'shards': 12,
     },
     'test': 'angle_deqp_gles3_tests',
     'args': [
       '--test-launcher-batch-limit=400',
       '--deqp-egl-display-type=angle-d3d11'
     ]
   },
 
   'angle_deqp_gles3_gl_tests': {
     'tester_configs': [
       {
         'fyi_only': True,
-        # TODO(jmadill): Run this on the optional tryservers.
+        # TODO(jmadill): Run this on ANGLE roll tryservers.
         'run_on_optional': False,
         # Run only on the Linux Release NVIDIA 32-bit bots (and trybots) for
         # the time being, at least until more capacity is added.
         'build_configs': ['Release'],
         'swarming_dimension_sets': [
+          # NVIDIA Linux
           {
             'gpu': '10de:104a',
             'os': 'Linux'
           }
         ],
       }
     ],
     'swarming': {
       'shards': 12,
     },
@@ skipping 752 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())