Update WebGL2 conformance tests

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 16 matching lines @@
 
     # ========================
     # Conformance expectations
     # ========================
 
     # All platforms.
 
     # Too slow (take about one hour to run)
     self.Skip('deqp/functional/gles3/builtinprecision/*.html', bug=619403)
 
-    self.Fail('deqp/functional/gles3/framebufferblit/*.html', bug=483282)
+    self.Fail('deqp/functional/gles3/framebufferblit/depth_stencil.html',
+        bug=483282)
     self.Fail('deqp/data/gles3/shaders/linkage.html', bug=601821)
-    self.Fail('deqp/functional/gles3/shaderoperator/*.html', bug=483282)
+    # self.Fail('deqp/functional/gles3/shaderoperator/*.html', bug=483282)
 
     self.Flaky('deqp/functional/gles3/negativefragmentapi.html', bug=604794)
 
     self.Fail('deqp/data/gles3/shaders/preprocessor.html', bug=483282)
 
     self.Fail('conformance2/glsl3/forbidden-operators.html', bug=483282)
 
     self.Flaky('conformance2/query/occlusion-query.html', bug=603168)
 
     # Avoid a conflict with a Mac expectation by setting
@@ skipping 37 matching lines @@
     self.Fail('deqp/functional/gles3/shadertexturefunction/' +
         'texturegradoffset.html',
         ['win'], bug=483282)
     self.Fail('deqp/functional/gles3/shadertexturefunction/' +
         'textureprojgrad.html',
         ['win'], bug=483282)
     self.Fail('deqp/functional/gles3/shadertexturefunction/' +
         'textureprojgradoffset.html',
         ['win'], bug=483282)
 
-    self.Fail('deqp/functional/gles3/textureshadow/2d*',
-        ['win'], bug=483282)
-    self.Fail('deqp/functional/gles3/textureshadow/cube*',
-        ['win'], bug=483282)
-
     self.Fail('conformance2/glsl3/array-in-complex-expression.html',
         ['win'], bug=483282)
     self.Skip('conformance2/reading/read-pixels-pack-parameters.html',
         ['win'], bug=483282)
     self.Skip('conformance2/reading/read-pixels-into-pixel-pack-buffer.html',
         ['win'], bug=1266) # angle bug ID
-    self.Fail('conformance2/state/gl-object-get-calls.html',
-        ['win'], bug=483282)
 
     self.Fail('deqp/functional/gles3/fbomultisample*',
         ['win'], bug=483282)
 
     self.Fail('deqp/functional/gles3/fboinvalidate/sub.html',
         ['win'], bug=483282)
     self.Fail('deqp/functional/gles3/fboinvalidate/whole.html',
         ['win'], bug=624506)
 
     # Windows 8 only.
 
     self.Fail('conformance2/reading/read-pixels-from-fbo-test.html',
         ['win8'], bug=483282)
     self.Flaky('deqp/functional/gles3/buffercopy.html', ['win8'], bug=587601)
 
     # Windows Debug. Causing assertions in the GPU process which raise
     # a dialog box, so have to skip them rather than mark them as
     # failing.
     self.Skip('conformance2/textures/canvas/' +
         'tex-2d-rgba8-rgba-unsigned_byte.html',
         ['win', 'debug'], bug=542901)
 
     # Win / NVidia
     self.Fail('deqp/functional/gles3/textureformat/compressed_cube.html',
         ['win', 'nvidia'], bug=614573)
+    self.Fail('deqp/functional/gles3/framebufferblit/rect_02.html',
+        ['win', 'nvidia'], bug=483282)
+    self.Fail('deqp/functional/gles3/framebufferblit/rect_05.html',
+        ['win', 'nvidia'], bug=483282)
 
     # Win / AMD
-    # It's unfortunate that this suppression needs 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('conformance2/*', ['win', ('amd', 0x6779)], bug=491419)
-    self.Flaky('deqp/*', ['win', ('amd', 0x6779)], bug=491419)
-
     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/textureformat/compressed_cube.html',
         ['win', ('amd', 0x6779)], bug=614573)
     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/shadercommonfunction.html',
         ['win', ('amd', 0x6779)], bug=621201)
     self.Fail('deqp/functional/gles3/fragmentoutput/array.int.html',
         ['win', ('amd', 0x6779)], bug=483282)
     self.Fail('deqp/functional/gles3/fragmentoutput/array.uint.html',
         ['win', ('amd', 0x6779)], bug=483282)
     self.Fail('deqp/functional/gles3/fragmentoutput/random_00.html',
         ['win', ('amd', 0x6779)], bug=483282)
     self.Fail('deqp/functional/gles3/fragmentoutput/random_01.html',
         ['win', ('amd', 0x6779)], bug=483282)
     self.Fail('deqp/functional/gles3/fragmentoutput/random_02.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)
+
+    # It's unfortunate that this suppression needs 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('conformance2/*', ['win', ('amd', 0x6779)], bug=491419)
+    self.Flaky('deqp/*', ['win', ('amd', 0x6779)], bug=491419)

[Zhenyao Mo, 2016/07/03 23:36:15]

This has to stay in the last, otherwise the above textureshadow tests will have
expectation of "flaky" instead of "fail", and turning bot red.

[Ken Russell (switch to Gerrit), 2016/07/06 19:47:39]

OK. Hopefully we can fix the textureshadow failures soon so that there will only
be one wildcard suppression.

+
     # Win / Intel
     self.Fail('conformance2/buffers/uniform-buffers.html',
         ['win', 'intel'], bug=483282)
     self.Skip('conformance2/textures/misc/copy-texture-image.html',
         ['win', 'intel'], bug=617449)
     self.Fail('deqp/functional/gles3/shaderderivate_*',
         ['win', 'intel'], bug=483282)
     self.Fail('deqp/functional/gles3/shaderstruct.html',
         ['win', 'intel'], bug=483282)
     self.Fail('deqp/functional/gles3/texturespecification/' +
@@ skipping 64 matching lines @@
         ['mac'], bug=612205)
     self.Fail('deqp/functional/gles3/texturewrap/e*',
         ['mac'], bug=612205)
 
     self.Fail('deqp/data/gles3/shaders/qualification_order.html',
         ['mac'], bug=483282)
     self.Fail('deqp/data/gles3/shaders/scoping.html',
         ['mac'], bug=483282)
     self.Fail('deqp/functional/gles3/pixelbufferobject.html',
         ['mac'], bug=483282)
-    self.Fail('deqp/functional/gles3/negativeshaderapi.html',
-        ['mac'], bug=483282)
 
     self.Fail('conformance2/textures/misc/compressed-tex-image.html',
         ['mac'], bug=565438)
-    self.Fail('conformance2/textures/misc/tex-new-formats.html',
-        ['mac'], bug=483282)
     self.Fail('conformance2/textures/misc/tex-storage-compressed-formats.html',
         ['mac'], bug=295792)
     self.Fail('conformance2/renderbuffers/framebuffer-test.html',
         ['mac'], bug=483282)
     self.Fail('conformance2/rendering/framebuffer-completeness-unaffected.html',
         ['mac'], bug=604053)
 
     self.Fail('deqp/functional/gles3/instancedrendering.html',
         ['mac'], bug=483282)
 
     self.Fail('deqp/functional/gles3/negativetextureapi.html',
         ['mac'], bug=483282)
 
     self.Fail('deqp/functional/gles3/fbomultisample*',
         ['mac'], bug=483282)
 
+    self.Fail('deqp/functional/gles3/framebufferblit/conversion_04.html',
+        ['mac'], bug=483282)
+    self.Fail('deqp/functional/gles3/framebufferblit/conversion_07.html',
+        ['mac'], bug=483282)
+    self.Fail('deqp/functional/gles3/framebufferblit/conversion_08.html',
+        ['mac'], bug=483282)
+    self.Fail('deqp/functional/gles3/framebufferblit/conversion_10.html',
+        ['mac'], bug=483282)
+    self.Fail('deqp/functional/gles3/framebufferblit/conversion_11.html',
+        ['mac'], bug=483282)
+    self.Fail('deqp/functional/gles3/framebufferblit/conversion_12.html',
+        ['mac'], bug=483282)
+    self.Fail('deqp/functional/gles3/framebufferblit/conversion_13.html',
+        ['mac'], bug=483282)
+    self.Fail('deqp/functional/gles3/framebufferblit/conversion_18.html',
+        ['mac'], bug=483282)
+    self.Fail('deqp/functional/gles3/framebufferblit/conversion_25.html',
+        ['mac'], bug=483282)
+    self.Fail('deqp/functional/gles3/framebufferblit/conversion_28.html',
+        ['mac'], bug=483282)
+    self.Fail('deqp/functional/gles3/framebufferblit/conversion_29.html',
+        ['mac'], bug=483282)
+    self.Fail('deqp/functional/gles3/framebufferblit/conversion_30.html',
+        ['mac'], bug=483282)
+    self.Fail('deqp/functional/gles3/framebufferblit/conversion_31.html',
+        ['mac'], bug=483282)
+    self.Fail('deqp/functional/gles3/framebufferblit/conversion_32.html',
+        ['mac'], bug=483282)
+    self.Fail('deqp/functional/gles3/framebufferblit/conversion_33.html',
+        ['mac'], bug=483282)
+    self.Fail('deqp/functional/gles3/framebufferblit/conversion_34.html',
+        ['mac'], bug=483282)
+    self.Fail('deqp/functional/gles3/framebufferblit/' +
+        'default_framebuffer_*.html',
+        ['mac'], bug=483282)
+
     # Mac Retina NVIDIA
     self.Fail('conformance2/textures/misc/tex-input-validation.html',
         ['mac', ('nvidia', 0xfe9), 'no_angle'], bug=483282)
     self.Fail('conformance2/textures/misc/tex-mipmap-levels.html',
         ['mac', ('nvidia', 0xfe9)], bug=483282)
     self.Fail('deqp/functional/gles3/shaderstruct.html',
         ['mac', ('nvidia', 0xfe9)], bug=483282)
     self.Fail('deqp/functional/gles3/shaderswitch.html',
         ['mac', ('nvidia', 0xfe9)], bug=483282)
     self.Fail('deqp/functional/gles3/negativevertexarrayapi.html',
@@ skipping 90 matching lines @@
         ['mac', ('nvidia', 0xfe9)], bug=483282)
     self.Fail('deqp/functional/gles3/draw/draw_range_elements.html',
         ['mac', ('nvidia', 0xfe9)], bug=483282)
 
     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)
+
     # 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',
         ['mac', 'amd'], bug=483282)
 
     self.Fail('deqp/functional/gles3/shadertexturefunction/' +
         'texturesize.html',
         ['mac', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/shadertexturefunction/' +
         'textureprojlodoffset.html',
         ['mac', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/shadertexturefunction/' +
         'texturelod.html',
         ['mac', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/shadertexturefunction/' +
         'textureprojlod.html',
         ['mac', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/vertexarrays/' +
         'single_attribute.normalize.html',
         ['mac', 'amd'], bug=483282)
 
+    self.Fail('deqp/functional/gles3/framebufferblit/rect_02.html',
+        ['mac', 'amd'], bug=483282)
+
+    self.Fail('deqp/functional/gles3/shaderoperator/' +
+        'angle_and_trigonometry_02.html',
+        ['mac', 'amd'], bug=483282)
+    self.Fail('deqp/functional/gles3/shaderoperator/' +
+        'angle_and_trigonometry_03.html',
+        ['mac', 'amd'], bug=483282)
+    self.Fail('deqp/functional/gles3/shaderoperator/common_fucntions.html',
+        ['mac', 'amd'], bug=483282)
+    self.Fail('deqp/functional/gles3/shaderoperator/geometric.html',
+        ['mac', 'amd'], bug=483282)
+
     # Mac Intel
     self.Fail('conformance2/textures/misc/tex-unpack-params.html',
         ['mac', 'intel', 'no_angle'], bug=483282)
 
     self.Fail('deqp/functional/gles3/shadercommonfunction.html',
         ['mac', 'intel'], bug=483282)
     self.Fail('deqp/functional/gles3/shaderderivate_*',
         ['mac', 'intel'], bug=483282)
     self.Fail('deqp/functional/gles3/transformfeedback/*.html',
         ['mac', 'intel'], bug=483282)
@@ skipping 38 matching lines @@
     self.Fail('deqp/functional/gles3/shadertexturefunction/' +
         'textureprojgrad.html',
         ['mac', 'intel'], bug=483282)
     self.Fail('deqp/functional/gles3/shadertexturefunction/' +
         'texelfetchoffset.html',
         ['mac', 'intel'], bug=483282)
     self.Fail('deqp/functional/gles3/shadertexturefunction/' +
         'texturesize.html',
         ['mac', 'intel'], bug=483282)
 
+    self.Fail('deqp/functional/gles3/framebufferblit/rect_02.html',
+        ['mac', 'intel'], bug=483282)
+    self.Fail('deqp/functional/gles3/framebufferblit/rect_03.html',
+        ['mac', 'intel'], bug=483282)
+    self.Fail('deqp/functional/gles3/framebufferblit/rect_04.html',
+        ['mac', 'intel'], bug=483282)
+    self.Fail('deqp/functional/gles3/framebufferblit/rect_05.html',
+        ['mac', 'intel'], bug=483282)
+    self.Fail('deqp/functional/gles3/framebufferblit/rect_06.html',
+        ['mac', 'intel'], bug=483282)
+
     # Linux only.
     self.Fail('deqp/data/gles3/shaders/functions.html',
         ['linux'], bug=483282)
     self.Fail('conformance2/glsl3/vector-dynamic-indexing.html',
         ['linux'], bug=483282)
     self.Fail('deqp/functional/gles3/fbodepthbuffer.html',
         ['linux'], bug=483282)
 
     # Behavior difference between GL compatibility profile and ES3.
     self.Fail('conformance2/rendering/draw-buffers.html',
@@ skipping 272 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'])