WebGL2 expectations: tighten up Linux 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 24 matching lines @@
     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.Fail('deqp/data/gles3/shaders/linkage.html', bug=601821)
 
-    # Mark this test Flaky on all platforms but Intel Linux that is failing
-    # reliably.
-    self.Flaky('conformance2/query/occlusion-query.html',
-        ['win', 'mac'], bug=603168)
-    self.Flaky('conformance2/query/occlusion-query.html',
-        ['linux', 'nvidia', 'amd'], bug=603168)
+    self.Flaky('conformance2/query/occlusion-query.html', bug=603168)
 
     self.Fail('conformance2/rendering/attrib-type-match.html', bug=627193)
 
     self.Fail('conformance2/rendering/uniform-block-buffer-size.html',
         bug=628863)
 
     self.Fail('conformance2/transform_feedback/' +
         'unwritten-output-defaults-to-zero.html', bug=1441) # ANGLE bug
 
     # Avoid a conflict with a Mac expectation by setting
@@ skipping 486 matching lines @@
     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('deqp/functional/gles3/texturespecification/' +
-        'random_teximage2d_cube.html',
-        ['linux'], bug=483282)
     self.Fail('deqp/functional/gles3/fboinvalidate/whole.html',
         ['linux'], bug=624506)
 
     # Multi-vendor failures.
 
     self.Fail('deqp/data/gles3/shaders/functions.html',
         ['linux', 'amd', 'intel'], bug=483282)
     self.Skip('deqp/data/gles3/shaders/qualification_order.html',
         ['linux', 'amd', 'intel'], bug=483282)
     self.Fail('deqp/functional/gles3/clipping.html',
         ['linux', 'amd', 'intel'], bug=483282)
     self.Flaky('deqp/functional/gles3/texturespecification/' +
         'random_teximage2d_2d.html',
         ['linux', 'amd', 'intel'], bug=618447)
 
     # Linux with ANGLE only
     self.Fail('conformance/misc/uninitialized-test.html',
         ['linux', 'opengl'], bug=483282)
-    self.Fail('conformance/state/state-uneffected-after-compositing.html',
-        ['linux', 'opengl'], bug=483282)
     self.Fail('conformance/textures/webgl_canvas/' +
         'tex-2d-rgba-rgba-unsigned_short_4_4_4_4.html',
         ['linux', 'opengl'], bug=483282)
     self.Fail('conformance/textures/webgl_canvas/' +
         'tex-2d-rgba-rgba-unsigned_short_5_5_5_1.html',
         ['linux', 'opengl'], bug=483282)
     self.Fail('conformance/textures/webgl_canvas/' +
         'tex-2d-rgb-rgb-unsigned_short_5_6_5.html',
         ['linux', 'opengl'], bug=483282)
     self.Fail('conformance2/textures/misc/tex-unpack-params.html',
         ['linux', 'opengl'], bug=483282)
     self.Fail('conformance2/reading/read-pixels-pack-parameters.html',
         ['linux', 'opengl'], bug=483282)
 
     # Linux NVIDIA only.
-    # La la la la la la la la la la ...
+    # La la la la la la la la la la ... (well, not right now, soon)
+    self.Fail('deqp/functional/gles3/texturespecification/' +
+        'random_teximage2d_cube.html',
+        ['linux', 'nvidia'], bug=483282)
 
     # Linux NVIDIA with ANGLE only
     self.Fail('conformance/attribs/gl-disabled-vertex-attrib.html',
               ['linux', 'nvidia', 'opengl'], bug=483282)
     self.Fail('deqp/functional/gles3/buffercopy.html',
         ['linux', 'nvidia', 'opengl'], bug=483282)
     self.Fail('deqp/functional/gles3/bufferobjectquery.html',
         ['linux', 'nvidia', 'opengl'], bug=483282)
     self.Fail('conformance2/transform_feedback/transform_feedback.html',
         ['linux', 'nvidia', 'opengl'], bug=483282)
     self.Fail('deqp/functional/gles3/transformfeedback/*.html',
         ['linux', 'nvidia', 'opengl'], bug=618408)
     self.Fail('deqp/functional/gles3/shadercommonfunction.html',
         ['linux', 'nvidia', 'opengl'], bug=618408)
     self.Fail('deqp/functional/gles3/shaderbuiltinvar.html',
         ['linux', 'nvidia', 'opengl'], bug=483282)
     self.Fail('deqp/functional/gles3/shaderpackingfunction.html',
         ['linux', 'nvidia', 'opengl'], bug=483282)
     self.Fail('conformance2/buffers/bound-buffer-size-change-test.html',
         ['linux', 'nvidia', 'opengl'], bug=483282)
 
     # Linux Intel
-    self.Fail('deqp/functional/gles3/pixelbufferobject.html',
-        ['linux', 'intel'], bug=598902)
     self.Fail('deqp/functional/gles3/shaderderivate_dfdx.html',
         ['linux', 'intel'], bug=618408)
 
     # See https://bugs.freedesktop.org/show_bug.cgi?id=94477
     self.Skip('conformance/glsl/bugs/temp-expressions-should-not-crash.html',
         ['linux', 'intel'], bug=540543)  # GPU timeout
 
     # The Mesa Intel driver has a scoping bug, see
     # https://bugs.freedesktop.org/show_bug.cgi?id=95184
     # It has been fixed in Mesa 12.0
@@ skipping 39 matching lines @@
         'default_framebuffer_00.html',
         ['linux', 'intel'], bug=598902)
     self.Fail('deqp/functional/gles3/framebufferblit/rect_02.html',
         ['linux', 'intel'], bug=598902)
 
     # Linux Intel with ANGLE only
     self.Fail('deqp/functional/gles3/fragmentoutput/*.html',
         ['linux', 'intel', 'opengl'], bug=598902)
 
     # Linux Intel without ANGLE only
-    self.Fail('conformance2/query/occlusion-query.html',
-        ['linux', 'intel', 'no_angle'], bug=598902)
-    self.Fail('conformance2/query/query.html',
-        ['linux', 'intel', 'no_angle'], bug=598902)
     self.Fail('conformance2/reading/read-pixels-from-fbo-test.html',
         ['linux', 'intel', 'no_angle'], bug=598902)
     self.Fail('conformance2/renderbuffers/framebuffer-object-attachment.html',
         ['linux', 'intel', 'no_angle'], bug=598902)
     self.Fail('deqp/functional/gles3/fbocompleteness.html',
         ['linux', 'intel', 'no_angle'], bug=598902)
-    self.Fail('deqp/functional/gles3/instancedrendering.html',
-        ['linux', 'intel', 'no_angle'], bug=598902)
-    self.Fail('deqp/functional/gles3/lifetime.html',
-        ['linux', 'intel', 'no_angle'], bug=598902)
-    self.Fail('deqp/functional/gles3/negativefragmentapi.html',
-        ['linux', 'intel', 'no_angle'], bug=598902)
-    self.Fail('deqp/functional/gles3/negativestateapi.html',
-        ['linux', 'intel', 'no_angle'], bug=598902)
-    self.Fail('deqp/functional/gles3/occlusionquery_conservative.html',
-        ['linux', 'intel', 'no_angle'], bug=598902)
-    self.Fail('deqp/functional/gles3/occlusionquery_strict.html',
-        ['linux', 'intel', 'no_angle'], bug=598902)
 
     # Linux AMD only.
     # It looks like AMD shader compiler rejects many valid ES3 semantics.
     self.Fail('deqp/data/gles3/shaders/conversions.html',
         ['linux', 'amd'], bug=483282)
     self.Skip('deqp/data/gles3/shaders/arrays.html',
         ['linux', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/internalformatquery.html',
         ['linux', 'amd'], bug=483282)
     self.Fail('deqp/functional/gles3/texturestatequery.html',
@@ skipping 247 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'])