Run WebGL 1.0 tests as part of the WebGL 2.0 conformance suite.

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 912 matching lines @@
           # http://crbug.com/540543: Linux Intel driver is GL 3.0 and
           # doesn't support features needed for ES3
           'Linux Release (New Intel)',
           'Linux Debug (New Intel)',
         ],
       },
     ],
     'target_name': 'webgl_conformance',
     'args': [
       '--webgl-conformance-version=2.0.0',
-      '--webgl2-only=true',
       # The current working directory when run via isolate is
       # out/Debug or out/Release. Reference this file relatively to
       # it.
       '--read-abbreviated-json-results-from=' + \
       '../../content/test/data/gpu/webgl2_conformance_tests_output.json',
     ],
     'swarming': {
-      # These tests currently take about an hour to run. Split them
-      # into roughly 5-minute shards.
-      'shards': 12,
+      # These tests currently take about an hour and fifteen minutes
+      # to run. Split them into roughly 5-minute shards.
+      'shards': 15,
     },
   },
   'webgl2_conformance_angle_tests': {
     'tester_configs': [
       {
          # The WebGL 2.0 conformance tests take over an hour to run on
          # the Debug bots, which is too long.
         'build_configs': ['Release'],
         'fyi_only': True,
         'run_on_optional': False,
         # Only run on the NVIDIA Release and New Intel Release Linux bots
         'swarming_dimension_sets': [
           {
             'gpu': '10de:104a',
             'os': 'Linux'
           },
           {
             'gpu': '8086:0412',
             'os': 'Linux'
           },
         ],
       },
     ],
     'target_name': 'webgl_conformance',
     'extra_browser_args': [
       '--use-gl=angle',
     ],
     'args': [
       '--webgl-conformance-version=2.0.0',
-      '--webgl2-only=true',
       # The current working directory when run via isolate is
       # out/Debug or out/Release. Reference this file relatively to
       # it.
       '--read-abbreviated-json-results-from=' + \
       '../../content/test/data/gpu/webgl2_conformance_tests_output.json',
     ],
     'swarming': {
-      # These tests currently take about an hour to run. Split them
-      # into roughly 5-minute shards.
-      'shards': 12,
+      # These tests currently take about an hour and fifteen minutes
+      # to run. Split them into roughly 5-minute shards.
+      'shards': 15,
     },
   },
 }
 
 def substitute_args(tester_config, args):
   """Substitutes the ${os_type} variable in |args| from the
      tester_config's "os_type" property.
   """
   substitutions = {
     'os_type': tester_config['os_type']
@@ skipping 213 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())