WebGL2 expectations: add initial webgl2 ANGLE expectations

content/test/gpu/gpu_tests/gpu_test_expectations.py

 # Copyright 2014 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.
 
 from gpu_tests import test_expectations
 
-ANGLE_CONDITIONS = ['d3d9', 'd3d11', 'opengl']
+ANGLE_CONDITIONS = ['d3d9', 'd3d11', 'opengl', 'no_angle']
 
 GPU_CONDITIONS = ['amd', 'arm', 'broadcom', 'hisilicon', 'intel', 'imagination',
                   'nvidia', 'qualcomm', 'vivante']
 
 class GpuExpectation(test_expectations.Expectation):
   def __init__(self, expectation, pattern, conditions=None, bug=None,
                max_num_retries=0):
     self.gpu_conditions = []
     self.device_id_conditions = []
     self.angle_conditions = []
     self.max_num_retries = max_num_retries
     assert self.max_num_retries == 0 or expectation == 'flaky'
     super(GpuExpectation, self).__init__(
       expectation, pattern, conditions=conditions, bug=bug)
 
   def ParseCondition(self, condition):
     """Adds support for GPU, device ID, and ANGLE conditions.
 
     GPU vendors:
       amd, arm, broadcom, hisilicon, intel, imagination, nvidia,
       qualcomm, vivante
 
     ANGLE renderer:
-      d3d9, d3d11, opengl
+      d3d9, d3d11, opengl, no_angle
+      no_angle can be used to avoid conflicts between expectations for
+      ANGLE and expectations not for ANGLE
 
     Specific GPUs can be listed as a tuple with vendor name and device ID.
     Examples: ('nvidia', 0x1234), ('arm', 'Mali-T604')
     Device IDs must be paired with a GPU vendor.
 
     Sample usage in SetExpectations in subclasses:
       self.Fail('gl-enable-vertex-attrib.html',
           ['mac', 'amd', ('nvidia', 0x1234)], bug=123)
     """
     if isinstance(condition, tuple):
@@ skipping 42 matching lines @@
       gpu_info = browser.GetSystemInfo().gpu
       gpu_vendor = self._GetGpuVendorString(gpu_info)
       gpu_device_id = self._GetGpuDeviceId(gpu_info)
       gpu_matches = ((not expectation.gpu_conditions and
           not expectation.device_id_conditions) or
           gpu_vendor in expectation.gpu_conditions or
           (gpu_vendor, gpu_device_id) in expectation.device_id_conditions)
       angle_renderer = self._GetANGLERenderer(gpu_info)
       angle_matches = (
         (not expectation.angle_conditions) or
         angle_renderer in expectation.angle_conditions)

[Ken Russell (switch to Gerrit), 2016/05/12 21:03:01]

Per comment on the other CL:

I think this logic needs to be updated to handle the 'no_angle' condition.
Otherwise, I'm pretty sure that any expectation which specifies it will never
match, since angle_renderer will be '' but expectation.angle_conditions will be
['no_angle'].

 
     return gpu_matches and angle_matches
 
   def _GetGpuVendorString(self, gpu_info):
     if gpu_info:
       primary_gpu = gpu_info.devices[0]
       if primary_gpu:
         vendor_string = primary_gpu.vendor_string.lower()
         vendor_id = primary_gpu.vendor_id
         if vendor_id == 0x10DE:
@@ skipping 16 matching lines @@
   def _GetANGLERenderer(self, gpu_info):
     if gpu_info and gpu_info.aux_attributes:
       gl_renderer = gpu_info.aux_attributes.get('gl_renderer')
       if gl_renderer:
         if 'Direct3D11' in gl_renderer:
           return 'd3d11'
         elif 'Direct3D9' in gl_renderer:
           return 'd3d9'
         elif 'OpenGL' in gl_renderer:
           return 'opengl'
-    return ''
+    return 'no_angle'