WebGL 2: Update expectations.

content/test/gpu/gpu_tests/webgl2_conformance_expectations.py

 # Copyright (c) 2015 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.webgl_conformance_expectations import WebGLConformanceExpectations
 
 # See the GpuTestExpectations class for documentation.
 
 class WebGL2ConformanceExpectations(WebGLConformanceExpectations):
   def __init__(self, conformance_path):
     super(WebGL2ConformanceExpectations, self).__init__(conformance_path)
@@ skipping 22 matching lines @@
     # Too slow (take about one hour to run)
     self.Skip('deqp/functional/gles3/builtinprecision/*.html', bug=619403)
 
     self.Fail('conformance2/glsl3/tricky-loop-conditions.html', bug=483282)
     self.Fail('conformance2/glsl3/vector-dynamic-indexing-nv-driver-bug.html',
         ['linux'], bug=483282)
 
     # All platforms.
     self.Flaky('conformance2/query/occlusion-query.html', bug=603168)
 
-    # Avoid a conflict with a Mac expectation by setting
-    self.Fail('conformance2/textures/misc/tex-input-validation.html',
-        ['d3d9', 'd3d11', 'opengl'], bug=483282)
-
     # All platforms with AMD GPU.
     self.Fail('deqp/functional/gles3/multisample.html',
         ['amd'], bug=617290)
 
     # Windows only.
     self.Fail('conformance/glsl/bugs/' +
         'pow-of-small-constant-in-user-defined-function.html',
         ['win'], bug=485641)
-    self.Fail('conformance/misc/uninitialized-test.html',
-        ['win'], bug=483282)
     self.Fail('conformance/rendering/point-specific-shader-variables.html',
         ['win'], bug=616335)
-    self.Fail('conformance/textures/webgl_canvas/' +
-        'tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html',
+
+    self.Fail('deqp/functional/gles3/fbomultisample*',
         ['win'], bug=483282)
-    self.Fail('conformance/textures/webgl_canvas/' +
-        'tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html',
-        ['win'], bug=483282)
-    self.Fail('conformance/textures/webgl_canvas/' +
-        'tex-2d-rgb-rgb-unsigned_short_5_6_5.html',
-        ['win'], bug=483282)
-    self.Fail('conformance/textures/image_bitmap_from_canvas/' +
-        'tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html',
-        ['win'], bug=628954)
-    self.Fail('conformance/textures/image_bitmap_from_canvas/' +
-        'tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html',
-        ['win'], bug=628954)
-    self.Fail('conformance/textures/image_bitmap_from_canvas/' +
-        'tex-2d-rgb-rgb-unsigned_short_5_6_5.html',
-        ['win'], bug=628954)
-
-    self.Fail('deqp/data/gles2/shaders/functions.html',
-        ['win'], bug=478572)
 
     # ANGLE bug id
     self.Fail('deqp/functional/gles3/fboinvalidate/sub.html',
         ['win'], bug=1246)
 
     # Windows 8 only.
     self.Flaky('deqp/functional/gles3/buffercopy.html', ['win8'], bug=587601)
 
     # Win / NVidia
     # La la la la la la la la la la ...
 
     # Win / AMD
-    self.Fail('deqp/functional/gles3/fbomultisample.8_samples.html',
-        ['win', ('amd', 0x6779)], bug=483282)
     self.Fail('deqp/functional/gles3/texturespecification/' +
         'texstorage2d_format_depth_stencil.html',
         ['win', ('amd', 0x6779)], bug=614178)
     self.Fail('deqp/functional/gles3/texturespecification/' +
         'texstorage3d_format_depth_stencil.html',
         ['win', ('amd', 0x6779)], bug=614178)
     self.Fail('deqp/functional/gles3/shadertexturefunction/texture.html',
         ['win', ('amd', 0x6779)], bug=483282)
     self.Fail('deqp/functional/gles3/shadertexturefunction/' +
         'texelfetchoffset.html',
         ['win', ('amd', 0x6779)], bug=483282)
     self.Fail('deqp/functional/gles3/shadertexturefunction/texturesize.html',
         ['win', ('amd', 0x6779)], bug=483282)
 
     self.Fail('deqp/functional/gles3/framebufferblit/rect_02.html',
         ['win', ('amd', 0x6779)], bug=483282)
     self.Fail('deqp/functional/gles3/textureshadow/2d*',
         ['win', ('amd', 0x6779)], bug=483282)
     self.Fail('deqp/functional/gles3/textureshadow/cube*',
         ['win', ('amd', 0x6779)], bug=483282)
 
     self.Fail('deqp/functional/gles3/transformfeedback/*',
         ['win', ('amd', 0x6779)], bug=626068)
 
+    self.Fail('deqp/functional/gles3/shadercommonfunction.html',
+        ['win', ('amd', 0x6779)], bug=483282)
+
     # It's unfortunate that these suppressions need to be so broad, but
     # basically any test that uses readPixels is potentially flaky, and
     # it's infeasible to suppress individual failures one by one.
     self.Flaky('conformance/*', ['win', ('amd', 0x6779)], bug=491419)
     self.Flaky('conformance2/*', ['win', ('amd', 0x6779)], bug=491419)
     self.Flaky('deqp/*', ['win', ('amd', 0x6779)], bug=491419)
 
     # Win / Intel
     self.Fail('conformance2/buffers/uniform-buffers.html',
         ['win', 'intel'], bug=483282)
@@ skipping 241 matching lines @@
 
     self.Fail('conformance2/rendering/draw-buffers.html',
         ['mac', ('nvidia', 0xfe9)], bug=617410)
 
     self.Fail('deqp/functional/gles3/fboinvalidate/format_02.html',
         ['mac', ('nvidia', 0xfe9)], bug=483282)
 
     self.Fail('deqp/functional/gles3/negativeshaderapi.html',
         ['mac', ('nvidia', 0xfe9)], bug=483282)
 
+    self.Flaky('deqp/functional/gles3/vertexarrays/' +
+        'multiple_attributes.output.html',
+        ['mac', ('nvidia', 0xfe9)], bug=483282)
+
     # Mac AMD
     self.Fail('deqp/functional/gles3/clipping.html',
         ['mac', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/primitiverestart/00.html',
         ['mac', 'amd'], bug=598930)
     self.Fail('deqp/functional/gles3/primitiverestart/01.html',
         ['mac', 'amd'], bug=598930)
     self.Fail('deqp/functional/gles3/shadercommonfunction.html',
         ['mac', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/transformfeedback/*.html',
@@ skipping 499 matching lines @@
     # self.Fail(page_name,
     #     ['linux', ('nvidia', 0x1), 'debug', 'opengl'])
     # self.Fail(page_name,
     #     ['win', ('nvidia', 0x1), 'debug', 'opengl'])
 
     # Conflicts if between a generic os condition and a specific version
     # self.Fail(page_name,
     #     ['xp', ('nvidia', 0x1), 'debug', 'opengl'])
     # self.Fail(page_name,
     #     ['win', ('nvidia', 0x1), 'debug', 'opengl'])