Add support for ASAN-specific test expectations to WebGL tests.

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 426 matching lines @@
         },
         {
           'gpu': '1002:6821',
           'hidpi': '1',
           'os': 'Mac'
         },
       ],
       'build_config': 'Release',
       'swarming': True,
       'os_type': 'mac',
+      'is_asan': True,
     },
     'Linux Release (NVIDIA)': {
       'swarming_dimensions': [
         {
           'gpu': '10de:104a',
           'os': 'Linux'
         },
       ],
       'build_config': 'Release',
       'swarming': True,
@@ skipping 787 matching lines @@
         'allow_on_android': True,
       },
     ],
   },
   'webgl_conformance': {
     'tester_configs': [
       {
         'allow_on_android': True,
       },
     ],
+    'asan_args': ['--is-asan'],
   },
   'webgl_conformance_d3d9_tests': {
     'tester_configs': [
       {
         'fyi_only': True,
         'os_types': ['win'],
         'run_on_optional': True,
       }
     ],
     'target_name': 'webgl_conformance',
     'extra_browser_args': [
       '--use-angle=d3d9',
     ],
+    'asan_args': ['--is-asan'],
   },
   'webgl_conformance_gl_tests': {
     'tester_configs': [
       {
         'fyi_only': True,
         'os_types': ['win'],
         'run_on_optional': True,
       }
     ],
     'disabled_tester_configs': [
@@ skipping 21 matching lines @@
             'gpu': '8086:0412',
             'os': 'Windows-2008ServerR2-SP1'
           },
         ],
       },
     ],
     'target_name': 'webgl_conformance',
     'extra_browser_args': [
       '--use-angle=gl',
     ],
+    'asan_args': ['--is-asan'],
   },
   'webgl_conformance_angle_tests': {
     'tester_configs': [
       {
         'fyi_only': True,
         'os_types': ['linux'],
         'run_on_optional': True,
       }
     ],
     'target_name': 'webgl_conformance',
     'extra_browser_args': [
       '--use-gl=angle',
     ],
+    'asan_args': ['--is-asan'],
   },
   'webgl_conformance_d3d11_passthrough': {
     'tester_configs': [
       {
         'fyi_only': True,
         'os_types': ['win'],
         'run_on_optional': True,
       }
     ],
     'target_name': 'webgl_conformance',
     'extra_browser_args': [
       '--use-angle=d3d11',
       '--use-passthrough-cmd-decoder',
     ],
+    'asan_args': ['--is-asan'],
   },
   'webgl2_conformance_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', 'Release_x64'],
         'fyi_only': True,
         'run_on_optional': True,
       },
     ],
     'disabled_tester_configs': [
       {
         'names': [
           # http://crbug.com/599451: this test is currently too slow
           # to run on x64 in Debug mode. Need to shard the tests.
           'Win7 x64 Debug (NVIDIA)',
         ],
       },
     ],
     'target_name': 'webgl_conformance',
     'args': [
       '--webgl-conformance-version=2.0.1',
       # 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',
     ],
+    'asan_args': ['--is-asan'],
     'swarming': {
       # 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
@@ skipping 23 matching lines @@
       '--use-gl=angle',
     ],
     'args': [
       '--webgl-conformance-version=2.0.1',
       # 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',
     ],
+    'asan_args': ['--is-asan'],
     'swarming': {
       # These tests currently take about an hour and fifteen minutes
       # to run. Split them into roughly 5-minute shards.
       'shards': 15,
     },
   },
 }
 
 # These isolated tests don't use telemetry. They need to be placed in the
 # isolated_scripts section of the generated json.
@@ skipping 33 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_asan(tester_config):
+  return tester_config.get('is_asan', False)
+
 def tester_config_matches_tester(tester_name, tester_config, tc, is_fyi,
                                  check_waterfall):
   if check_waterfall:
     if tc.get('fyi_only', False) and not is_fyi:
       return False
     # Handle the optional tryservers with the 'run_on_optional' flag.
     # Only a subset of the tests run on these tryservers.
     if tester_name.startswith('Optional') and not tc.get(
         'run_on_optional', False):
       return False
@@ skipping 150 matching lines @@
   if extra_browser_args_string != "":
     test_args.append('--extra-browser-args=' + extra_browser_args_string)
   if 'args' in test_config:
     test_args.extend(substitute_args(tester_config, test_config['args']))
   if 'desktop_args' in test_config and not is_android(tester_config):
     test_args.extend(substitute_args(tester_config,
                                      test_config['desktop_args']))
   if 'android_args' in test_config and is_android(tester_config):
     test_args.extend(substitute_args(tester_config,
                                      test_config['android_args']))
+  if 'asan_args' in test_config and is_asan(tester_config):
+    test_args.extend(substitute_args(tester_config,
+                                     test_config['asan_args']))
   # The step name must end in 'test' or 'tests' in order for the
   # results to automatically show up on the flakiness dashboard.
   # (At least, this was true some time ago.) Continue to use this
   # naming convention for the time being to minimize changes.
   step_name = test
   if not (step_name.endswith('test') or step_name.endswith('tests')):
     step_name = '%s_tests' % step_name
   # Prepend GPU-specific flags.
   swarming = {
     # Always say this is true regardless of whether the tester
@@ skipping 79 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())