Update WebGL conformance test suite version to 2.0.1

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, url_prefixes=None):
     super(WebGL2ConformanceExpectations, self).__init__(
@@ skipping 19 matching lines @@
         ['win', 'mac', 'linux'])
     self.Skip('WebglExtension_WEBGL_compressed_texture_pvrtc',
         ['win', 'mac', 'linux'])
     self.Skip('WebglExtension_WEBGL_compressed_texture_s3tc_srgb',
         ['win', 'mac', 'linux'])
 
     # ========================
     # Conformance expectations
     # ========================
 
-    # 2.0.1 OR LATER
     # 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)
-
-    self.Fail('deqp/functional/gles3/framebufferblit/conversion_28.html',
-        ['mac'], bug=654187)
-    self.Fail('deqp/functional/gles3/framebufferblit/conversion_30.html',
-        ['mac'], bug=654187)
-    self.Fail('deqp/functional/gles3/framebufferblit/conversion_31.html',
-        ['mac'], bug=654187)
-    self.Fail('deqp/functional/gles3/framebufferblit/conversion_33.html',
-        ['mac'], bug=654187)
-
     # All platforms.
     self.Flaky('conformance2/query/occlusion-query.html', bug=603168)
+    self.Fail('conformance2/glsl3/tricky-loop-conditions.html', bug=483282)
+    self.Fail('conformance2/rendering/rendering-sampling-feedback-loop.html',
+        bug=660844)
+    self.Fail('conformance2/textures/misc/' +
+        'integer-cubemap-specification-order-bug.html',
+        bug=483282) # owner:cwallez, test might be buggy
 
     # Windows only.
-    # We are awesome!
+    self.Fail('conformance2/textures/misc/tex-srgb-mipmap.html',
+        ['win'], bug=634519)
+    self.Fail('conformance2/rendering/blitframebuffer-outside-readbuffer.html',
+        ['win'], bug=644740)
 
     # Win / NVidia
     self.Flaky('deqp/functional/gles3/fbomultisample*',
         ['win', 'nvidia'], bug=631317)
 
     # Win / AMD
+    self.Fail('conformance2/rendering/blitframebuffer-stencil-only.html',
+        ['win', 'amd'], bug=483282) # owner:jmadill
 
     # Failing on old R5 230 configuration.
     self.Fail('deqp/functional/gles3/shadertexturefunction/' +
         'texelfetchoffset.html',
         ['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)
     self.Fail('deqp/functional/gles3/multisample.html',
         ['win', ('amd', 0x6779)], bug=617290)
 
     # Keep a separate set of failures for the R7 240, since it can use a new
     # and updated driver. The older drivers won't ever get fixes from AMD.
     # Use ['win', ('amd', 0x6613)] for the R7 240 devices.
-    # We are awesome!
 
     # 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.Skip('conformance2/textures/misc/copy-texture-image.html',
@@ skipping 40 matching lines @@
         'framebuffer-completeness-unaffected.html',
         ['mac'], bug=630800)
     self.Fail('deqp/functional/gles3/fbocompleteness.html',
         ['mac'], bug=630800)
     # self.Fail('deqp/functional/gles3/fbocompleteness.html',
     #     ['mac', ('nvidia', 0xfe9)], bug=616562)
 
     self.Fail('conformance2/renderbuffers/framebuffer-test.html',
         ['mac'], bug=641149)
 
+    self.Fail('deqp/functional/gles3/framebufferblit/conversion_28.html',
+        ['mac'], bug=654187)
+    self.Fail('deqp/functional/gles3/framebufferblit/conversion_30.html',
+        ['mac'], bug=654187)
+    self.Fail('deqp/functional/gles3/framebufferblit/conversion_31.html',
+        ['mac'], bug=654187)
+    self.Fail('deqp/functional/gles3/framebufferblit/conversion_33.html',
+        ['mac'], bug=654187)
+
+    self.Fail('conformance2/reading/format-r11f-g11f-b10f.html',
+        ['mac'], bug=1832) # khronos WebGL issue
+
     # Mac Retina NVIDIA
     self.Fail('deqp/functional/gles3/fbomultisample*',
         ['mac', ('nvidia', 0xfe9)], bug=641209)
     self.Fail('deqp/functional/gles3/framebufferblit/' +
         'default_framebuffer_04.html',
         ['mac', ('nvidia', 0xfe9)], bug=483282)
     self.Fail('conformance/attribs/gl-disabled-vertex-attrib.html',
         ['mac', ('nvidia', 0xfe9)], bug=483282)
     self.Flaky(
         'conformance/extensions/webgl-compressed-texture-size-limit.html',
@@ skipping 222 matching lines @@
         ['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/geometric.html',
         ['mac', 'amd'], bug=483282)
 
     self.Flaky('deqp/functional/gles3/shaderindexing/mat_02.html',
         ['mac', 'amd'], bug=644360)
 
+    self.Fail('conformance2/rendering/clipping-wide-points.html',
+        ['mac', 'amd'], bug=642822)
+    self.Fail('conformance2/reading/read-pixels-from-rgb8-into-pbo-bug.html',
+        ['mac', 'amd'], bug=646182)
+    self.Fail('conformance2/rendering/instanced-rendering-bug.html',
+        ['mac', 'amd'], bug=645298)
+
     # Mac Pro with AMD GPU
     self.Fail('conformance2/textures/misc/tex-mipmap-levels.html',
         ['mac', ('amd', 0x679e)], bug=483282)
     self.Flaky('deqp/functional/gles3/shaderindexing/mat_01.html',
         ['mac', ('amd', 0x679e)], bug=636648)
     self.Flaky('deqp/functional/gles3/shaderindexing/tmp.html',
         ['mac', ('amd', 0x679e)], bug=659871)
     self.Fail('deqp/functional/gles3/shadertexturefunction/' +
         'texturesize.html',
         ['mac', ('amd', 0x679e)], bug=640506)
@@ skipping 85 matching lines @@
     self.Fail('conformance2/textures/image_data/' +
         'tex-2d-rgb8ui-rgb_integer-unsigned_byte.html',
         ['mac', 'intel'], bug=665197)
     self.Fail('conformance2/textures/image_data/' +
         'tex-2d-rg8ui-rg_integer-unsigned_byte.html',
         ['mac', 'intel'], bug=665197)
     self.Fail('conformance2/textures/image_data/' +
         'tex-2d-r8ui-red_integer-unsigned_byte.html',
         ['mac', 'intel'], bug=665197)
 
+    self.Fail('conformance2/textures/misc/' +
+        'integer-cubemap-texture-sampling.html',
+        ['mac', 'intel'], bug=658930)
+
     # Fixed on OSX 10.11
     self.Fail('deqp/functional/gles3/uniformbuffers/random.html',
         ['mac', 'intel'], bug=618464)
 
     # Linux only.
     self.Flaky('conformance/textures/video/' +
                'tex-2d-rgba-rgba-unsigned_byte.html',
                ['linux'], bug=627525)
     self.Flaky('conformance/textures/video/' +
                'tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html',
                ['linux'], bug=627525)
     self.Flaky('conformance/textures/video/' +
                'tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html',
                ['linux'], bug=627525)
     self.Flaky('conformance/textures/video/' +
                'tex-2d-rgb-rgb-unsigned_byte.html',
                ['linux'], bug=627525)
     self.Flaky('conformance/textures/video/' +
                'tex-2d-rgb-rgb-unsigned_short_5_6_5.html',
                ['linux'], bug=627525)
+    self.Fail('conformance2/glsl3/vector-dynamic-indexing-nv-driver-bug.html',
+        ['linux'], bug=483282)
 
     # Linux Multi-vendor failures.
     self.Skip('deqp/data/gles3/shaders/qualification_order.html',
         ['linux', 'amd', 'intel'], bug=483282)
     self.Flaky('deqp/functional/gles3/texturespecification/' +
         'random_teximage2d_2d.html',
         ['linux', 'amd', 'intel'], bug=618447)
 
     # Linux NVIDIA
     # This test is flaky both with and without ANGLE.
@@ skipping 290 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'])