Roll WebGL conformance tests.

content/test/gpu/gpu_tests/webgl_conformance_expectations.py

 # Copyright (c) 2013 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.
 import os
 
 from gpu_test_expectations import GpuTestExpectations
 
 # See the GpuTestExpectations class for documentation.
 
 class WebGLConformanceExpectations(GpuTestExpectations):
@@ skipping 14 matching lines @@
     if not '*' in pattern:
       full_path = os.path.normpath(os.path.join(self.conformance_path, pattern))
       if not os.path.exists(full_path):
         raise Exception('The WebGL conformance test path specified in' +
           'expectation does not exist: ' + full_path)
 
   def SetExpectations(self):
     # Fails on all platforms
     self.Fail('deqp/data/gles2/shaders/constant_expressions.html',
         bug=478572)
+    self.Fail('deqp/data/gles2/shaders/constants.html',
+        bug=478572)
     self.Fail('deqp/data/gles2/shaders/fragdata.html',
         bug=478572)
     self.Fail('deqp/data/gles2/shaders/functions.html',
         bug=478572)
+    self.Fail('deqp/data/gles2/shaders/linkage.html',
+        bug=478572)
     self.Fail('deqp/data/gles2/shaders/preprocessor.html',
         bug=478572)
     self.Fail('deqp/data/gles2/shaders/scoping.html',
         bug=478572)
     self.Fail('conformance/glsl/misc/const-variable-initialization.html',
         bug=485632)
     self.Fail('conformance/misc/expando-loss.html',
         bug=485634)
 
     # Win failures
@@ skipping 359 matching lines @@
 
     self.Fail('deqp/functional/gles3/textureformat.html', bug=483282)
     self.Fail('deqp/functional/gles3/transformfeedback.html', bug=483282)
     self.Fail('deqp/functional/gles3/uniformbuffers.html', bug=483282)
 
     self.Fail('conformance2/attribs/gl-vertex-attrib.html', bug=483282)
     self.Fail('conformance2/attribs/gl-vertex-attrib-i-render.html', bug=483282)
     self.Fail('conformance2/attribs/gl-vertexattribipointer.html', bug=483282)
     self.Fail('conformance2/attribs/gl-vertexattribipointer-offsets.html',
         bug=483282)
-
-    self.Fail('conformance2/context/constants-and-properties-2.html',
-        bug=483282)
-
-    self.Fail('conformance2/core/draw-buffers.html', bug=483282)
-    self.Fail('conformance2/core/frag-depth.html', bug=483282)
-    self.Fail('conformance2/core/tex-mipmap-levels.html', bug=483282)
-
-    self.Fail('conformance2/core/tex-new-formats.html', bug=483282)
-    self.Fail('conformance2/core/tex-storage-2d.html', bug=483282)
-    self.Fail('conformance2/core/tex-storage-and-subimage-3d.html', bug=483282)
-    self.Fail('conformance2/core/texture-npot.html', bug=483282)
-
-    self.Fail('conformance2/glsl3/misplaced-version-directive.html', bug=483282)
-
-    self.Fail('conformance2/state/gl-get-calls.html', bug=483282)
-    self.Fail('conformance2/state/gl-object-get-calls.html', bug=483282)
-
     self.Fail('conformance2/buffers/buffer-copying-contents.html', bug=483282)
     self.Fail('conformance2/buffers/buffer-copying-restrictions.html',
         bug=483282)
     self.Fail('conformance2/buffers/buffer-type-restrictions.html', bug=483282)
     self.Fail('conformance2/buffers/getBufferSubData.html', bug=483282)
+    self.Fail('conformance2/context/constants-and-properties-2.html',
+        bug=483282)
+
+    self.Fail('conformance2/glsl3/array-complex-indexing.html', bug=483282)
+    self.Fail('conformance2/glsl3/frag-depth.html', bug=483282)
+    self.Fail('conformance2/glsl3/invalid-default-precision.html', bug=483282)
+    self.Fail('conformance2/glsl3/sequence-operator-returns-non-constant.html',
+        bug=483282)
+    self.Fail('conformance2/glsl3/ternary-operator-on-arrays-glsl3.html',
+        bug=483282)
+    self.Fail('conformance2/misc/instanceof-test.html', bug=483282)
+    self.Fail('conformance2/renderbuffers/framebuffer-test.html', bug=483282)
+    self.Fail('conformance2/rendering/draw-buffers.html', bug=483282)
+    self.Fail('conformance2/state/gl-get-calls.html', bug=483282)
+    self.Fail('conformance2/state/gl-object-get-calls.html', bug=483282)
+    self.Fail('conformance2/textures/gl-get-tex-parameter.html', bug=483282)
+    self.Fail('conformance2/textures/tex-input-validation.html', bug=483282)
+    self.Fail('conformance2/textures/tex-mipmap-levels.html', bug=483282)
+    self.Fail('conformance2/textures/tex-new-formats.html', bug=483282)
+    self.Fail('conformance2/textures/tex-storage-2d.html', bug=483282)
+    self.Fail('conformance2/textures/texture-npot.html', bug=483282)
+    self.Fail('conformance2/transform_feedback/transform_feedback.html',
+        bug=483282)
+
+    # Mac only.
+    self.Fail('conformance2/renderbuffers/' +
+        'multisampled-renderbuffer-initialization.html',
+        ['mac'], bug=483282)
+    self.Fail('conformance2/rendering/instanced-arrays.html',
+        ['mac'], bug=483282)
+    self.Fail('conformance2/textures/tex-storage-and-subimage-3d.html',
+        ['mac'], bug=483282)